summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/flvdec: re enable flv_data_packet()Michael Niedermayer2015-03-131-2/+7
| | | | | | Found-by: kurosu Reviewed-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/flvdec: Change subtitle stream type to subtitle typeMichael Niedermayer2015-03-131-8/+8
| | | | | Previous-version-reviewed-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/svq1dec: Fix undefined shiftsMichael Niedermayer2015-03-131-2/+4
| | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* lavc: Print number of reference frames if debug level >= verbose.Carl Eugen Hoyos2015-03-131-0/+6
|
* lavf: Do not list mov-only codecs in riff.c.Carl Eugen Hoyos2015-03-132-3/+7
| | | | | | Instead check for all mov code-points when demuxing avi and print a warning if a video codec is found like this. Fixes a regression similar to the one described in ticket #4307.
* doc: Fix alphabetic ordering for decklink input device.Carl Eugen Hoyos2015-03-131-81/+81
|
* x86: xvid_idct: port SSE2 iDCT to yasmChristophe Gisquet2015-03-135-413/+398
| | | | | | | | The main difference consists in renaming properly labels, and letting yasm select the gprs for skipping 1D transforms. Previous-version-reviewed-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* Merge commit '913aa9a4874418724183a3ec862cdc63b829367d'Michael Niedermayer2015-03-131-3/+3
|\ | | | | | | | | | | | | * commit '913aa9a4874418724183a3ec862cdc63b829367d': libx264: Return more meaningful error codes Merged-by: Michael Niedermayer <[email protected]>
| * libx264: Return more meaningful error codesHimangi Saraogi2015-03-121-3/+3
| | | | | | | | Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'Michael Niedermayer2015-03-121-1/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd': matroskadec: Check memory allocations Conflicts: libavformat/matroskadec.c See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46 Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: Check memory allocationsVittorio Giovara2015-03-121-0/+6
| | | | | | | | CC: [email protected]
* | Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'Michael Niedermayer2015-03-121-2/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8': formats: Check memory allocations Conflicts: libavfilter/formats.c See: 527ca3985c736ffe077a82fdf3616f0fd571b923 Merged-by: Michael Niedermayer <[email protected]>
| * formats: Check memory allocationsVittorio Giovara2015-03-121-1/+10
| |
* | Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'Michael Niedermayer2015-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '5a2645cafeca1c2207ac55cc831c3349572a82ed': nutdec: Prevent leaks on memory error Conflicts: libavformat/nutdec.c See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea Merged-by: Michael Niedermayer <[email protected]>
| * nutdec: Prevent leaks on memory errorVittorio Giovara2015-03-121-2/+4
| | | | | | | | Bug-Id: CID 205122 / CID 205123
* | Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'Michael Niedermayer2015-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'edca1dd552efa1ebef016ca9eff4ce6757605819': xcbgrab: Check av_strdup() allocation Conflicts: libavdevice/xcbgrab.c See: db442c873631065e8719df6da91c016d25501084 Merged-by: Michael Niedermayer <[email protected]>
| * xcbgrab: Check av_strdup() allocationVittorio Giovara2015-03-121-0/+2
| | | | | | | | Bug-Id: CID 1274038
* | Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'Michael Niedermayer2015-03-121-0/+2
|\| | | | | | | | | | | | | * commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e': libtheora: Check frame allocation Merged-by: Michael Niedermayer <[email protected]>
| * libtheora: Check frame allocationVittorio Giovara2015-03-121-0/+2
| |
* | Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'Michael Niedermayer2015-03-121-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'a72d93daa09ffbad2771f1450820941055eaf210': mpegvideo_enc: Check AVCodecContext allocation Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegvideo_enc: Check AVCodecContext allocationVittorio Giovara2015-03-121-0/+2
| |
* | Merge commit '78c892284150e12f6b08b287bdf7e62307c6985f'Michael Niedermayer2015-03-121-1/+27
|\| | | | | | | | | | | | | * commit '78c892284150e12f6b08b287bdf7e62307c6985f': dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables Merged-by: Michael Niedermayer <[email protected]>
| * dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tablesNiels Möller2015-03-121-1/+27
| |
* | hevcdsp: fix compilation for arm and aarch64James Almer2015-03-125-12/+62
| | | | | | | | | | | | | | Also add av_cold to ff_hevcdsp_init_arm. Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | mips/asmdefs: use _ABI64 as defined by gccJames Cowgill2015-03-121-3/+1
| | | | | | | | | | | | | | | | | | Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header, the easiest way around this is to just use the preprocessor definitions from gcc / clang. Signed-off-by: James Cowgill <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/vp9: Fix undefined shifts in decode_frame_header()Michael Niedermayer2015-03-121-2/+2
| | | | | | | | | | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <[email protected]> Reviewed-by: "Ronald S. Bultje" <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264_mb: Fix undefined shiftsMichael Niedermayer2015-03-121-7/+7
| | | | | | | | | | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <[email protected]> Reviewed-by: "Ronald S. Bultje" <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | hevc: delay ff_thread_finish_setup for hwaccelRainer Hochecker2015-03-121-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'Michael Niedermayer2015-03-122-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda': lavf: Explicitly convert types at function pointer assignment Conflicts: libavformat/avio.c libavformat/aviobuf.c libavformat/swfenc.c See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Explicitly convert types at function pointer assignmentDiego Biurrun2015-03-113-3/+8
| | | | | | | | This fixes a number of "assignment from incompatible pointer type" warnings.
* | Merge commit '9c8074050745184a61059ad56045ad711299e33d'Michael Niedermayer2015-03-121-1/+1
|\| | | | | | | | | | | | | * commit '9c8074050745184a61059ad56045ad711299e33d': configure: Mark qsv subsystem as not selectable on the command line Merged-by: Michael Niedermayer <[email protected]>
| * configure: Mark qsv subsystem as not selectable on the command lineDiego Biurrun2015-03-111-1/+1
| |
* | avfilter/colormatrix:add slice threadingYayoi2015-03-121-52/+94
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in ↵Michael Niedermayer2015-03-121-2/+2
| | | | | | | | | | | | | | | | | | av_buffer_make_writable() This allows making a AVBufferRef writable without the need to update all pointers to it Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in ↵Michael Niedermayer2015-03-121-2/+1
| | | | | | | | | | | | | | | | | | av_buffer_realloc() This allows reallocating AVBufferRefs without the need to update all pointers to it Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'Michael Niedermayer2015-03-120-0/+0
|\| | | | | | | | | | | | | | | * commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1': roqvideoenc: set enc->avctx in roq_encode_init See: cf82c426fadf90105e1fb9d5ecd267cc3aa2b288 Merged-by: Michael Niedermayer <[email protected]>
| * roqvideoenc: set enc->avctx in roq_encode_initAndreas Cadhalpun2015-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | So far it is only set in roq_encode_frame, but it is used in roq_encode_end to free the coded_frame. This currently segfaults if roq_encode_frame is not called between roq_encode_init and roq_encode_end. CC:[email protected] Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a'Michael Niedermayer2015-03-120-0/+0
|\| | | | | | | | | | | | | | | * commit '72211a2af0470799c9611b9c1c7039ab14a34a0a': asfenc: fix leaking asf->index_ptr on error See: 2c8cff2be4a044c66e4904efa156dafd0d332d25 Merged-by: Michael Niedermayer <[email protected]>
| * asfenc: fix leaking asf->index_ptr on errorAndreas Cadhalpun2015-03-111-0/+1
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'Michael Niedermayer2015-03-121-3/+10
|\| | | | | | | | | | | | | * commit '212556cd2144659dc6b9d121ddb38cd272bd10ae': qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4} Merged-by: Michael Niedermayer <[email protected]>
| * qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}Yukinori Yamazoe2015-03-111-3/+10
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'Michael Niedermayer2015-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb': configure: Enable colored output for gcc 4.9+ Conflicts: configure Merged-by: Michael Niedermayer <[email protected]>
| * configure: Enable colored output for gcc 4.9+Vittorio Giovara2015-03-111-0/+1
| |
* | Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'Michael Niedermayer2015-03-111-5/+0
|\| | | | | | | | | | | | | * commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51': rtpdec_vp9: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <[email protected]>
| * rtpdec_vp9: Drop extra sanity check for size of input packetVittorio Giovara2015-03-111-5/+0
| | | | | | | | | | | | | | | | In this case len is always at least 1, since it is checked against RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check. Bug-Id: CID 1270811
* | Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'Michael Niedermayer2015-03-111-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8': mp3: Properly use AVCodecContext API Conflicts: libavformat/mp3dec.c See: 6ad42b3e15478284321dd285acaf189a16590854 See: b851bc20c6931c084710e69f7eec30d8c1bdb68e Merged-by: Michael Niedermayer <[email protected]>
| * mp3: Properly use AVCodecContext APIVittorio Giovara2015-03-111-2/+9
| | | | | | | | | | | | | | Rather than having an unitialized context on the stack, allocate it with defaults and free it when unneeded. CC: [email protected]
* | Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'Michael Niedermayer2015-03-111-1/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '9272c965d9559a90ee64d46aebd99c117e07f7a3': matroskaenc: Fix type used for chapter timestamps Conflicts: libavformat/matroskaenc.c See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626 Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: Fix type used for chapter timestampsVittorio Giovara2015-03-111-3/+4
| |
* | Merge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'Michael Niedermayer2015-03-110-0/+0
|\| | | | | | | | | | | | | | | * commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa': mlpdec: support TrueHD streams with an Atmos substream See: 36bf549b2706bd10014556a84a33ed6daf5d5373 Merged-by: Michael Niedermayer <[email protected]>