summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'Michael Niedermayer2015-07-035-8/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1316df7aa98c4784f190d107206d0bb12c590b89': lavu: add an API function to return the Libav version string Conflicts: .gitignore Makefile cmdutils.c doc/APIchanges libavutil/avutil.h libavutil/utils.c See: f91126643a91c2d3f8d8e210c8facaf259951b03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add an API function to return the Libav version stringwm42015-07-026-5/+22
| | | | | | | | | | | | | | | | This returns something like "v12_dev0-1332-g333a27c". This is much more useful than the individual library versions, of which there are too many, and which are very hard to map back to releases or git commits. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | swscale: implement YA8 outputPaul B Mahol2015-07-0213-1/+108
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wavpack: limit extra_bits to 32 and use get_bits_longAndreas Cadhalpun2015-07-021-2/+6
| | | | | | | | | | | | | | | | More than 32 bits can't be stored in an integer and get_bits should not be used with more than 25 bits. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avfilter/vf_mpdecimate: remove packed formatsPaul B Mahol2015-07-021-3/+0
| | | | | | | | | | | | Packed formats are not supported. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: use AVFILTER_DEFINE_CLASS()Paul B Mahol2015-07-025-36/+9
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/qsvenc_h264: Change the set of performance presets to match with the ↵Ivan Uskov2015-07-021-4/+8
| | | | | | | | | | | | MFX library constants. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Reorder operations to avoid undefined behaviorMichael Niedermayer2015-07-021-4/+4
| | | | | | | | | | | | | | Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/motion_est_template: Fix undefined shifts in CHECK_MV()Michael Niedermayer2015-07-021-3/+3
| | | | | | | | | | | | | | Fixes:asan_heap-oob_4d5bb0_2295_cov_3374722539_hotel_california_ra5.1_640x480_30s.rmvb Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/qsv: Extending QSV/MFX session initialization for the linux platform ↵Ivan Uskov2015-07-022-1/+86
| | | | | | | | | | | | | | | | | | where a display handle is required. Now ff_qsv_init_internal_session() is able to find appropriate display handle under linux using VAAPI. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers/segment: fix formatting of segment_list_type optionStefano Sabatini2015-07-021-7/+3
| | | | | | | | Place @item entry at the right point, remove duplicated description.
* | avformat/asfdec_f: Fix memleakMichael Niedermayer2015-07-021-0/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec_f: Add ASFDataType, use named types for metadataJohn Adlum2015-07-022-6/+24
| | | | | | | | | | | | This is based on asfdec_o.c, but uses a proper type instead of defines Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of ↵John Adlum2015-07-021-6/+11
| | | | | | | | | | | | a fixed size buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec_f: factor error checking out of main header parsing loopJohn Adlum2015-07-021-7/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_filter: log more information on failure to init simple filter graphrogerdpack2015-07-021-2/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'Michael Niedermayer2015-07-022-9/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a31c4b2cbef9aee15910fc3df52519aef46760de': fate-g2m3: disable the audio stream Conflicts: tests/ref/fate/g2m3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate-g2m3: disable the audio streamJanne Grunau2015-07-012-5/+1
| | | | | | | | | | The audio decoder is not in fate-g2m3 dependencies and the wma2 decoder is probably not bit-exact since it it float based.
* | avformat/utils: Redesign scoring in av_find_default_stream_index()Michael Niedermayer2015-07-011-10/+10
| | | | | | | | | | | | | | | | | | | | This avoids empty streams from being selected if a equivalent non empty one is available The new system is also clearer and more systematic This may need finetuning, which should be easy to do ... Fixes Ticket2687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Favor streams that had packetsMichael Niedermayer2015-07-011-1/+1
| | | | | | | | | | | | Fixes Thailand-Wave.wmv without explicitly specifying a stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtmpproto: increase hardcoded url/path lengthsPaul B Mahol2015-07-011-2/+2
| | | | | | | | | | | | Fixes #4103. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavu: Makefile: skip atomic.c if native atomics are availableRodger Combs2015-07-011-1/+2
| | | | | | | | | | | | This prevents a linker warning and skips a useless compilation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264dsp_template: Fix undefined shiftsMichael Niedermayer2015-07-011-2/+2
| | | | | | | | | | | | | | Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mss2: Fix integer overflowMichael Niedermayer2015-07-011-3/+3
| | | | | | | | | | | | | | | | This also simplifies the code Fixes: signal_sigabrt_7ffff6ac8cc9_2943_cov_3588637614_mss2_speech.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4e0819310e2d2eff60be2d6df28335f0739712b9'Michael Niedermayer2015-07-010-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '4e0819310e2d2eff60be2d6df28335f0739712b9': elsdec: Replace EOVERFLOW with INVALIDDATA See: dec728888f8826e3f2032aec463c3dd1e26ec2a4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * elsdec: Replace EOVERFLOW with INVALIDDATAMichael Niedermayer2015-07-011-1/+1
| | | | | | | | | | | | EOVERFLOW is not available on all platforms. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'Michael Niedermayer2015-07-014-60/+60
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721': g2meet: force simple idct for identical results over all fate configs Conflicts: tests/ref/fate/g2m3 tests/ref/fate/g2m4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: force simple idct for identical results over all fate configsJanne Grunau2015-07-014-63/+63
| |
* | avfilter/vf_extractplanes: use faster path for input formats with only one ↵Paul B Mahol2015-07-011-1/+2
| | | | | | | | | | | | component Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_extractplanes: rename misleading variablePaul B Mahol2015-07-011-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_extractplanes: support more pixel formatsPaul B Mahol2015-07-011-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'Michael Niedermayer2015-07-011-11/+1
|\ \ | |/ | | | | | | | | | | * commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a': g2meet: use av_ceil_log2 instead of a custom function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: use av_ceil_log2 instead of a custom functionJanne Grunau2015-07-011-11/+1
| |
* | Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'Michael Niedermayer2015-07-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75': g2meet: use an unsigned type for the djb hash Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: use an unsigned type for the djb hashJanne Grunau2015-07-011-1/+1
| |
* | Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'Michael Niedermayer2015-07-013-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '007e27d363ba7d994019dc897dc9c39071bb204a': avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer() Conflicts: libavcodec/atrac3plusdec.c libavcodec/sp5xdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()Janne Grunau2015-07-013-1/+3
| |
* | avformat/asfdec_f: Assert that packet positions match in asf_read_pts()John Adlum2015-07-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec_f: Correct skip to key codeJohn Adlum2015-07-011-1/+2
| | | | | | | | | | | | Fixes Ticket3978 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: Correcting typo of "occurred"John Adlum2015-07-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functionsShivraj Patil2015-07-016-0/+386
| | | | | | | | | | | | | | This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mvpred: Fix undefined shifts in MAP_F2FMichael Niedermayer2015-07-011-2/+2
| | | | | | | | | | | | | | Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/motion_est: Fix some undefined shiftsMichael Niedermayer2015-07-011-5/+5
| | | | | | | | | | | | | | Fixes: asan_heap-oob_1dd60fd_1049_cov_4200102444_P4250048.MOV Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: add an API function to return the FFmpeg version stringwm42015-07-013-0/+15
| | | | | | | | | | | | | | | | This returns something like "N-73264-gb54ac84". This is much more useful than the individual library versions, of which there are too much and which are very hard to map back to releases or git commits. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/concatdec: copy stream metadata when using concatVadim Belov2015-07-011-0/+2
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutdec: Check ff_gen_search() for failureMichael Niedermayer2015-07-011-0/+2
| | | | | | | | | | | | | | Fixes assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/motion_est: Fix undefined shifts in cmp_inline()Michael Niedermayer2015-07-011-2/+2
| | | | | | | | | | | | | | Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c()Michael Niedermayer2015-07-011-2/+2
| | | | | | | | | | | | | | Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR()Michael Niedermayer2015-07-011-3/+3
| | | | | | | | | | | | | | Fixes: signal_sigsegv_2e64ee0_2762_cov_4170502227_missing_frames.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Fix undefined shift in read_sint()Michael Niedermayer2015-07-011-1/+1
| | | | | | | | | | | | | | Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud