summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'Michael Niedermayer2014-02-041-0/+27
|\ \ | |/ | | | | | | | | | | * commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6': lavf: do basic sanity checking on muxed packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do basic sanity checking on muxed packetsAnton Khirnov2014-02-041-0/+27
| | | | | | | | Reject packets for non-existing or attachment streams.
* | Merge commit '5de64bb34d68d6c224dca90003172d7a27958825'Michael Niedermayer2014-02-041-2/+8
|\ \ | |/ | | | | | | | | | | * commit '5de64bb34d68d6c224dca90003172d7a27958825': utvideoenc: Add support for the new BT.709 FourCCs for YCbCr Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utvideoenc: Add support for the new BT.709 FourCCs for YCbCrJan Ekström2014-02-041-2/+8
| | | | | | | | | | | | | | | | With cli usage the decoder might have not set the colorspace during encoder init, manual colorspace override might be needed in such cases. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter/dualinput: fix repeatlast to match docs and eof_action=passMichael Niedermayer2014-02-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'de203abd71baae7f120313259b45cf935c85203e'Michael Niedermayer2014-02-042-2/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'de203abd71baae7f120313259b45cf935c85203e': vf_overlay: add eof_action switch Conflicts: doc/filters.texi libavfilter/vf_overlay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: add eof_action switchKeith Lawson2014-02-042-5/+46
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'Michael Niedermayer2014-02-042-0/+10
|\ \ | |/ | | | | | | | | | | * commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e': hevc: check that the VCL NAL types are the same for all slice segments of a frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: check that the VCL NAL types are the same for all slice segments of a ↵Anton Khirnov2014-02-042-0/+10
| | | | | | | | | | | | | | | | | | | | frame Fixes possible invalid memory access for mismatching skipped/non-skipped slice segments. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Sample-Id: 00001533-google
* | avcodec/h264: update current_sps & sps->new only after the whole slice ↵Michael Niedermayer2014-02-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | header decoder and init code finished This avoids them being cleared before the full initialization finished Fixes out of array read Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: Disallow pps_id changing between slicesMichael Niedermayer2014-02-042-0/+12
| | | | | | | | | | | | | | | | | | Such changes are forbidden in H.264 and lead to race conditions Fixes out of array read Fixes: signal_sigsegv_f9796a_1613_cov_3114610371_FM1_BT_B.h264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabledMichael Niedermayer2014-02-031-0/+2
| | | | | | | | | | | | This prevents stale pointers from being left Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with msvc/icl due to missing header and define.Matt Oliver2014-02-032-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'dilaroga/master'Michael Niedermayer2014-02-032-0/+9
|\ \ | | | | | | | | | | | | | | | | | | * dilaroga/master: vda: fix crash when a frame is dropped. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vda: fix crash when a frame is dropped.Xidorn Quan2014-01-272-0/+9
| | | | | | | | | | | | Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
* | | avcodec/aac_adtstoasc_bsf: Fix memory leakAlex Sukhanov2014-02-031-0/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libavformat/utils.c: Cosmetics: Fix incorrect comma placementStåle Kristoffersen2014-02-031-1/+1
| | |
* | | avcodec/aacdec: Fix pulse position checks in decode_pulses()Michael Niedermayer2014-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes out of array read Fixes: asan_static-oob_1efed25_1887_cov_2013541199_HeyYa_RA10_AAC_192K_30s.rm Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/hnm4video: check offset before subtraction in decode_interframe_v4a()Michael Niedermayer2014-02-031-1/+6
| | | | | | | | | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_1326a09_1752_cov_245452111_GRTH301.HNS Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | RoQ encoder: support different integer frameratesaddr-see-the-website@aetey.se2014-02-033-5/+30
| | | | | | | | | | | | | | | | | | | | | Even though the most common framerate for RoQ is 30fps, the format supports other framerates too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1Michael Niedermayer2014-02-023-2/+4
| | | | | | | | | | | | | | | | | | This makes the code clearer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: dvd still frames read thru libdvdnav ended up in internal ↵Voyager12014-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lavf buffer This is the solution we've been using in XBMC for over 2 years for dvd still frames. The problem is that the demuxer asks for probing of the codec in the mpeg stream. This causes lavf to read the whole menu structure into internal buffers. After which, it won't read from input stream anymore and no events triggers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavd/opengl_enc: fix parentheses in if conditionLukasz Marek2014-02-021-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavfi/ebur128: add true peak metering per frameJean First2014-02-022-2/+12
| | | | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com>
* | | lavfi/ebur128: print peak metering in dBFSJean First2014-02-022-12/+30
| | | | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com>
* | | lavfi/ebur128: add sample and true peak metering.Clément Bœsch2014-02-023-12/+151
| | | | | | | | | | | | | | | | | | Metadata injection and logging. Not yet present visually. Signed-off-by: Jean First <jeanfirst@gmail.com>
* | | lavfi/drawtext: fix reinit commandAndrey Utkin2014-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | | Problem was that reinit argument wasn't used. Regression came in at commit fd6228e65711e63a9e35e9a1087d7ce62040e6e3 Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | | lavfi/movie: fix display of pushed frame informationStefano Sabatini2014-02-021-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken since 7e350379f87e7f7. Also fix warnings: libavfilter/src_movie.c: In function ‘describe_frame_to_str’: libavfilter/src_movie.c:392:5: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations] libavfilter/src_movie.c:408:9: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
* | | doc/APIchanges: fix weird reindentStefano Sabatini2014-02-021-2/+2
| | |
* | | lavf: add output_ts_offset option to AVFormatContextStefano Sabatini2014-02-026-2/+33
| | | | | | | | | | | | | | | This option can be generally useful to set an output offset, needed when setting an absolute index in the output.
* | | lavf/avformat.h: fix typosStefano Sabatini2014-02-021-2/+2
| | |
* | | ffmpeg: tweak debug_ts logging and add more of itStefano Sabatini2014-02-021-6/+33
| | | | | | | | | | | | Help with debugging timestamp issues.
* | | examples/avio_reading: remove stray empty lineStefano Sabatini2014-02-021-1/+0
| | |
* | | examples: add avio_reading.c exampleStefano Sabatini2014-02-025-1/+139
| | |
* | | lavfi/overlay: add yuv422 format modeStefano Sabatini2014-02-026-2/+75
| | |
* | | libavformat/mtv: add test for audio magicReynaldo H. Verdejo Pinochet2014-02-011-0/+4
| | | | | | | | | | | | | | | | | | | | | MTV files have the string "MP3" as audio magic on their header. Always. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | | fate/xvid: fix idct & bitexact flagMichael Niedermayer2014-02-022-21/+21
| | | | | | | | | | | | | | | | | | should fix test to match on all platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'Michael Niedermayer2014-02-021-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit '816e5b997028c8215c804b1e58b2388592ed612b': hevc: Reject impossible slice segment Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: Reject impossible slice segmentLuca Barbato2014-02-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | A dependent slice cannot have address 0. Prevent an out of array bound load in ff_hevc_cabac_init(). Sample-Id: 00001406-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | Merge commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e'Michael Niedermayer2014-02-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e': hevc: Consider first quantization group any reference to 0, 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: Consider first quantization group any reference to 0, 0Luca Barbato2014-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | According to my understanding of T-REC-H.265-2013044 chapter 8.6.1. Sample-Id: 00001438-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | Merge commit 'c716624853339ea4b1086a3957b334829370204c'Michael Niedermayer2014-02-021-2/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c716624853339ea4b1086a3957b334829370204c': mxf: Read field dominance flag Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxf: Read field dominance flagMatthieu Bouron2014-02-011-0/+19
| | | | | | | | | | | | | | | | | | And export the information in field_order. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'Michael Niedermayer2014-02-021-3/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d56f2fffc14ad02001ee0689bee76a759da9ede': mxf: Handle negative edit_rate Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxf: Handle negative edit_rateLuca Barbato2014-02-011-0/+9
| | | | | | | | | | | | Default to 1/25.
* | | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-02-022-150/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/opengl_enc: remove inlines lavd/opengl_enc: fix window caption lavd/opengl_enc: simplify opengl_load_procedures usage lavd/opengl_enc: factorize deinit_context function lavd/opengl_enc: factorize create/release window functions lavd/opengl_enc: rename GL_RED_COMPONENT define lavd/opengl_enc: create format description table lavd/opengl_enc_shaders: make shaders code static and const Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | | lavd/opengl_enc: remove inlinesLukasz Marek2014-02-021-6/+4
| | | | | | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | | lavd/opengl_enc: fix window captionLukasz Marek2014-02-021-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | | lavd/opengl_enc: simplify opengl_load_procedures usageLukasz Marek2014-02-021-6/+11
| | | | | | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | | lavd/opengl_enc: factorize deinit_context functionLukasz Marek2014-02-021-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also fixes opengl deinitialization. Program and shaders where not deleted. Could impact MacOS implementation based on SDL window. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
OpenPOWER on IntegriCloud