aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * dump: Use the correct abs() versionVittorio Giovara2015-07-011-1/+1
| | | | | | | | | | | | Fix warning from clang "absolute value function 'abs' given an argument of type 'long long' but has parameter of type 'int' which may cause truncation of value [-Wabsolute-value]".
* | Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'Michael Niedermayer2015-07-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6': lavfi: Add library identifier Conflicts: libavfilter/version.h See: a70b4935f1867797b62312c20035025fad8b1f94 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: Add library identifierVittorio Giovara2015-07-011-1/+3
| |
* | Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'Michael Niedermayer2015-07-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '0f87f9b4fceee854f09da2d1ef329245196775f8': lavd: Add library identifier Conflicts: libavdevice/version.h See: a70b4935f1867797b62312c20035025fad8b1f94 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavd: Add library identifierVittorio Giovara2015-07-011-1/+3
| |
* | Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'Michael Niedermayer2015-07-011-0/+2
|\| | | | | | | | | | | | | * commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e': lavc: Add missing API guard to dtg_active_format option Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add missing API guard to dtg_active_format optionVittorio Giovara2015-07-011-0/+2
| |
* | Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'Michael Niedermayer2015-07-014-0/+228
|\| | | | | | | | | | | | | * commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008': g2meet: Add FATE tests for all three G2M variants Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: Add FATE tests for all three G2M variantsDiego Biurrun2015-07-014-0/+227
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'Michael Niedermayer2015-07-017-26/+1220
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368': Go2Meeting decoder Conflicts: Changelog libavcodec/g2meet.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Go2Meeting decoderKostya Shishkov2015-07-017-26/+1220
| | | | | | | | | | | | | | | | ELS and ePIC decoder courtesy of Maxim Poliakovski, cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'Michael Niedermayer2015-07-0111-22/+24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c': fate: Avoid unnecessary pixel format conversions Conflicts: tests/fate/image.mak tests/ref/fate/dds-ya Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Avoid unnecessary pixel format conversionsMartin Storsjö2015-06-3011-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the fate-dds-* and fate-txd-* tests already output into the same pixel format regardless of platform endianness, so there's no need to force conversion to another format. This fixes the tests fate-txd-16bpp, fate-txd-odd, fate-dds-rgb16, fate-dds-rgb24 and fate-dds-xrgb on big endian, where the tests seem to fail due to issues with certain conversion codepaths in swscale. Those conversion codepaths should of course be fixed, but the individual decoder tests should use as little extra conversion steps as possible. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/aacsbr: Assert that bs_num_env is positiveMichael Niedermayer2015-07-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacsbr: check that the element type matches before applying SBRMichael Niedermayer2015-07-012-0/+9
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: windows: respond to logoff and ctrl+break messages as wellrogerdpack2015-07-012-0/+43
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: only count got_output/errors in decode_error_statAndreas Cadhalpun2015-07-011-3/+3
| | | | | | | | | | | | | | | | | | If threading is used, the first (thread_count - 1) packets are read before any frame/error is returned. Counting this as successful decoding is wrong, because it also happens when no single frame could be decoded. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffmpeg: exit_on_error if decoding a packet failedAndreas Cadhalpun2015-07-011-0/+9
| | | | | | | | | | | | | | This is the second part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | pthread_frame: forward error codes when flushingAndreas Cadhalpun2015-07-011-0/+11
| | | | | | | | | | | | | | This is the first part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/h264: Greenmetadata SEI parsingNicolas DEROUINEAU2015-06-305-0/+89
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'Michael Niedermayer2015-06-304-33/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '271ce76d317c5432e151216cf23f12b77ed6cb7e': h264: Parse registered data SEI message and AFD value Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_sei.c libavcodec/version.h See: d6e95669496a89d186f923c34bcaf7d86b7cd59c See: 22291c372fa703242e8429bed61700ba81258f19 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Parse registered data SEI message and AFD valueVittorio Giovara2015-06-304-1/+67
| | | | | | | | | | | | Partially based on code by Marton Balint and Kieran Kunhya. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'Michael Niedermayer2015-06-301-12/+3
|\| | | | | | | | | | | | | | | | | | | * commit '0bfab80a0d9fce0180e8aa2a947267f89b725091': h264_sei: Group error check outside the switch block Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: Group error check outside the switch blockVittorio Giovara2015-06-301-12/+2
| |
* | Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'Michael Niedermayer2015-06-301-5/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit '0a49a62f998747cfa564d98d36a459fe70d3299b': h263: Always check both dimensions Conflicts: libavcodec/ituh263dec.c See: 62006b539ddda23594febf0fcb2f21c03de60457 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Always check both dimensionsLuca Barbato2015-06-301-3/+5
| | | | | | | | | | CC: libav-stable@libav.org Found-By: ago@gentoo.org
* | Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f'Michael Niedermayer2015-06-301-6/+6
|\| | | | | | | | | | | | | * commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f': cosmetic: Reformat ff_h263_decode_mba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetic: Reformat ff_h263_decode_mbaLuca Barbato2015-06-301-6/+6
| |
* | Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'Michael Niedermayer2015-06-301-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a': mov: Preserve the metadata even when bit-exactness is requested Conflicts: libavformat/movenc.c tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth2-mpeg4 See: a17ee4117dcb2922f57da33b8401d11b06e81cba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Preserve the metadata even when bit-exactness is requestedLuca Barbato2015-06-303-11/+11
| | | | | | | | | | | | | | Make sure to not write the custom `encoder` string in that case. Bug-Id: 845 CC: libav-stable@libav.org
* | Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'Michael Niedermayer2015-06-301-1/+1
|\| | | | | | | | | | | | | * commit '303ec065a90498c29d384b4add2ac626bc38d5eb': aic: Fix slice size computation for widths multiples of 32 macroblocks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aic: Fix slice size computation for widths multiples of 32 macroblocksVittorio Giovara2015-06-301-1/+1
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'Michael Niedermayer2015-06-301-5/+2
|\| | | | | | | | | | | | | | | | | | | * commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a': h264: Allow stream and container cropping at the same time Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Allow stream and container cropping at the same timeVittorio Giovara2015-06-301-5/+2
| | | | | | | | | | | | | | | | The container cropping is applied only when difference is within 16 pixels, and the smallest value between the two is chosen. Bug-Id: 383 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avfilter/vf_ssim: fix some cosmetics issuesPaul B Mahol2015-06-301-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'Michael Niedermayer2015-06-301-4/+6
|\| | | | | | | | | | | | | * commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f': fate: Update ac3 test to the new request_channel_layout option Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Update ac3 test to the new request_channel_layout optionVittorio Giovara2015-06-301-4/+6
| |
* | avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/hMichael Niedermayer2015-06-301-2/+2
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_transpose: Fix rounding errorMichael Niedermayer2015-06-301-1/+1
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Mention hap encoding for --enable-libsnappy.Carl Eugen Hoyos2015-06-301-1/+1
| |
* | lavc/j2kenc: Make jp2 output compatible with Kakadu.Carl Eugen Hoyos2015-06-309-16/+17
| | | | | | | | Fixes ticket #4689.
* | doc: Add jpeg2000 encoder documentation.Carl Eugen Hoyos2015-06-301-0/+15
| |
* | lavc/hapenc: Silence a warning for multithreaded encoding.Carl Eugen Hoyos2015-06-301-1/+2
| |
* | avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is usedMichael Niedermayer2015-06-301-0/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9/update_prob: prevent out of bounds table readJames Zern2015-06-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | the max value of the lookup in expanded form is: (((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254 add one entry of padding to inv_map_table[] to prevent out of bounds access with non-conforming / fuzzed bitstreams Signed-off-by: James Zern <jzern@google.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'Michael Niedermayer2015-06-301-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Add jpeg2000 stream typeJohn Högberg2015-06-301-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'Michael Niedermayer2015-06-301-1/+3
|\| | | | | | | | | | | | | | | | | | | * commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501': riff: Validate the wav header size before trying to parse it Conflicts: libavformat/riffdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Validate the wav header size before trying to parse itLuca Barbato2015-06-281-0/+3
| |
* | Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'Michael Niedermayer2015-06-301-6/+0
|\| | | | | | | | | | | | | * commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68': asf: Do not skip data streams Merged-by: Michael Niedermayer <michaelni@gmx.at>