Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-10avcodec/h264: Do not fail with randomly truncated VUIsMichael Niedermayer
Fixes Ticket4445 Tested-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'Michael Niedermayer
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736': h264: drop the now unused per-slice H264Contexts Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'Michael Niedermayer
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9': h264: move rbsp_buffer into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_parser.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'Michael Niedermayer
* commit 'f42485dbce614b3f63182845da43db690b427b7c': h264: use a separate GetBitContext for slice data Conflicts: libavcodec/h264.c libavcodec/h264_cavlc.c libavcodec/h264_parser.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'Michael Niedermayer
* commit '95eb35f30513e335990ad0d5dca6ddc318477291': h264: move the ref lists variables into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_mb.c libavcodec/h264_picture.c libavcodec/h264_refs.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '56febc993b928ccc039a32158ca60b234c311875'Michael Niedermayer
* commit '56febc993b928ccc039a32158ca60b234c311875': h264: move the slice type variables into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'Michael Niedermayer
* commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87': h264: split weighted pred-related vars into per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_mb.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21h264: drop the now unused per-slice H264ContextsAnton Khirnov
2015-03-21h264: move rbsp_buffer into the per-slice contextAnton Khirnov
2015-03-21h264: use a separate GetBitContext for slice dataAnton Khirnov
2015-03-21h264: move the ref lists variables into the per-slice contextAnton Khirnov
2015-03-21h264: move the slice type variables into the per-slice contextAnton Khirnov
2015-03-21h264: split weighted pred-related vars into per-slice contextAnton Khirnov
2015-02-19Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'Michael Niedermayer
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49': h264_parser: export video format and dimensions Conflicts: libavcodec/h264_parser.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19h264_parser: export video format and dimensionsAnton Khirnov
2015-02-15avcodec/h264: use avpriv_find_start_code() in h264_split()Zhaoxiu Zeng
This also allows replacing several literal numbers by named constants And it should be faster, the function is not speed relevant though as it is generally only called a few times at the streams start. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28avcodec/h264_parser: Rename close()Michael Niedermayer
This avoids a potential conflict with the equally named function for closing files It also could reduce confusion in debugger backtraces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'Michael Niedermayer
* commit '9404a47a2d1df418946a338938eb6cdb3afed474': h264: move parser-only variables to their own context Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27h264_parser: restore a comment lost in 0268a54Anton Khirnov
2015-01-27h264: move parser-only variables to their own contextAnton Khirnov
2014-11-12avcodec/h264_parser: Avoid adding SEI to the global headerMichael Niedermayer
Only consider SEI when no PPS has been found yet Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'Michael Niedermayer
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde': h264_parser: don't stop on SPS_EXT in split Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11h264_parser: don't stop on SPS_EXT in splitJohn Stebbins
Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split. These codes can come before the PPS and results in incomplete extradata.
2014-10-31avcodec/h264_parser: Use av_freep() to avoid leaving stale pointersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-27avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.cMichael Niedermayer
Fixes Ticket4011 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15avcodec/h264: fix time_base and framerateMichael Niedermayer
They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-05Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'Michael Niedermayer
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8': h264: Move start code search functions into separate source files. Conflicts: libavcodec/arm/Makefile libavcodec/arm/h264dsp_init_arm.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/startcode.c libavcodec/startcode.h See: 270cede3f3772117454a14b620803d731036942d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05h264: Move start code search functions into separate source files.Ben Avison
This permits re-use with parsers for codecs which use similar start codes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-02avcodec/h264_parser: remove redundant assignmentMichael Niedermayer
Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31libavcodec/h264_parser: Increase parse_history, fix huge resolutionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara
2014-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: h264_parser: use enum values in h264_find_frame_end() Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15h264_parser: use enum values in h264_find_frame_end()Vittorio Giovara
2014-02-14Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'Michael Niedermayer
* commit '73e8fab31dc19c4371499e612856accbc00b2820': h264: print values in case of error Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14h264: print values in case of errorVittorio Giovara
Also make error style consistent and drop redundant information.
2013-10-26avcodec/h264_parser: heuristically detect non marked keyframesMichael Niedermayer
Fixes Ticket3083 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'Michael Niedermayer
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991': h264_parser: Use ff_h264_reset_sei() Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22h264_parser: Use ff_h264_reset_sei()Yusuke Nakamura
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-22h264_parser: Fix order of operationsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-20avcodec/h264_parser: fix order of operationsMichael Niedermayer
Fixes CID1108576 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'Michael Niedermayer
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208': h264_parser: Fix POC parsing for the case where MMCO_RESET is present. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'Michael Niedermayer
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9': h264_parser: Fix POC parsing for the case where MMCO_RESET is absent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15h264_parser: Fix POC parsing for the case where MMCO_RESET is present.Yusuke Nakamura
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-15h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.Yusuke Nakamura
The prev_ values were not set after parsing POC. Increase length of the buffer decoded to parse enough safely. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-08Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'Michael Niedermayer
* commit '218d6844b37d339ffbf2044ad07d8be7767e2734': h264dsp: Factorize code into a new function, h264_find_start_code_candidate Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'Michael Niedermayer
* commit '7a82022ee2f9b1fad991ace0936901e7419444be': h264_parser: Initialize the h264dsp context in the parser as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08h264dsp: Factorize code into a new function, h264_find_start_code_candidateBen Avison
This performs the start code search which was previously part of h264_find_frame_end() - the most CPU intensive part of the function. By itself, this results in a performance regression: Before After Mean StdDev Mean StdDev Change Overall time 2925.6 26.2 3068.5 31.7 -4.7% but this can more than be made up for by platform-optimised implementations of the function. Signed-off-by: Martin Storsjö <martin@martin.st>