aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'Michael Niedermayer2013-12-124-4/+10
|\ | | | | | | | | | | | | | | | | | | * commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671': lavc: deprecate avcodec_get_frame_defaults(). Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_get_frame_defaults().Anton Khirnov2013-12-114-4/+10
| | | | | | | | | | Also bump libavcodec micro and add an APIchanges entry saying that av_frame_* should now be used instead of the lavc AVFrame functions.
* | Merge commit '598ce4ab4f1893e0661fc038101487e511937877'Michael Niedermayer2013-12-121-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '598ce4ab4f1893e0661fc038101487e511937877': h264: call av_frame_unref() instead of avcodec_get_frame_defaults(). Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: call av_frame_unref() instead of avcodec_get_frame_defaults().Anton Khirnov2013-12-111-3/+3
| | | | | | | | | | | | This is a temporary workaround to allow deprecating avcodec_get_frame_defaults(). The proper solution will be using a properly allocated AVFrame in Picture.
* | Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'Michael Niedermayer2013-12-121-2/+1
|\| | | | | | | | | | | | | * commit '48d17ee6dc2b2a552f645484f200c2946bf24607': api-example: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * api-example: remove an unneeded call to avcodec_get_frame_defaults().Anton Khirnov2013-12-111-2/+1
| | | | | | | | avcodec_decode_audio4() resets the frame itself.
* | Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'Michael Niedermayer2013-12-121-1/+0
|\| | | | | | | | | | | | | * commit '281a40e18f923510f2067d05c5b0cf08cc49dfee': lavf: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove an unneeded call to avcodec_get_frame_defaults().Anton Khirnov2013-12-111-1/+0
| | | | | | | | avcodec_decode_*() resets the frame itself.
* | Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'Michael Niedermayer2013-12-121-4/+4
|\| | | | | | | | | | | | | * commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69': mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().Anton Khirnov2013-12-111-4/+4
| | | | | | | | | | | | This is a temporary workaround to allow deprecating avcodec_get_frame_defaults(). The proper solution will be using a properly allocated AVFrame in Picture.
* | Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'Michael Niedermayer2013-12-111-1/+0
|\| | | | | | | | | | | | | * commit 'b06c8bce02b15115a4789252365df2dda0c4713c': mpegvideo: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().Anton Khirnov2013-12-111-1/+0
| | | | | | | | ff_mpeg_unref_picture() already resets the frame.
* | Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'Michael Niedermayer2013-12-111-1/+0
|\| | | | | | | | | | | | | | | | | | | * commit '84f131921ffb43d8070d5680e91f6a24d66ccac4': avplay: do not call avcodec_get_frame_defaults(). Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: do not call avcodec_get_frame_defaults().Anton Khirnov2013-12-111-2/+1
| | | | | | | | avcodec_decode_audio4() will reset the frame itself.
* | Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'Michael Niedermayer2013-12-111-2/+2
|\| | | | | | | | | | | | | * commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521': lavc: call av_frame_unref() instead of avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().Anton Khirnov2013-12-111-2/+2
| | | | | | | | avcodec_get_frame_defaults() will be deprecated.
* | Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'Michael Niedermayer2013-12-111-2/+1
|\| | | | | | | | | | | | | | | | | | | * commit '674fa49110a661694188a958be13d529b7c8c5dd': avconv: do not call avcodec_get_frame_defaults() Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: do not call avcodec_get_frame_defaults()Anton Khirnov2013-12-111-2/+1
| | | | | | | | | | | | Strictly speaking it is not correct to call it on refcounted frames, in any case it is unnecessary, since filtered_frame is always unreferenced after poll_filter() returns.
* | Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'Michael Niedermayer2013-12-112-12/+7
|\| | | | | | | | | | | | | * commit '943135621830ac3857d3cf766cfc280a95bb3c13': lavc: deprecate avcodec_free_frame() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate avcodec_free_frame()Anton Khirnov2013-12-112-12/+7
| | | | | | | | av_frame_free() should be used instead.
* | Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'Michael Niedermayer2013-12-114-7/+7
|\| | | | | | | | | | | | | | | | | | | * commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9': Replace all uses of avcodec_free_frame with av_frame_free(). Conflicts: doc/examples/decoding_encoding.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all uses of avcodec_free_frame with av_frame_free().Anton Khirnov2013-12-115-8/+8
| |
* | Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9'Michael Niedermayer2013-12-110-0/+0
|\| | | | | | | | | | | | | | | * commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9': hevc: set time_base when possible See: f90281ca97d45a87e3671f5e6e64794f2632fef2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: set time_base when possibleGuillaume Martres2013-12-111-0/+14
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '33452aede6acab78f726cd1924824585f00765cc'Michael Niedermayer2013-12-111-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '33452aede6acab78f726cd1924824585f00765cc': hevc: store the VPS list as an AVBufferRef, just like the others *PS Conflicts: libavcodec/hevc.c libavcodec/hevc_ps.c See: 36658c978f5d7df2ce556075946f3a80f7eca753 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: store the VPS list as an AVBufferRef, just like the others *PSGildas Cocherel2013-12-113-10/+20
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3'Michael Niedermayer2013-12-110-0/+0
|\| | | | | | | | | | | | | | | * commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3': hevc: do not dereference pointer before NULL check in verify_md5() See: f2eca8d06060b9ec265c21ae38b6dd3088c52cc6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: do not dereference pointer before NULL check in verify_md5()Michael Niedermayer2013-12-111-1/+3
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'Michael Niedermayer2013-12-111-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26': configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64 Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64Diego Biurrun2013-12-111-1/+1
| | | | | | | | | | This enables a more POSIX-compliant printf implementation, that allows using length modifiers like 'z'.
* | tools/probetest: Check av_realloc() return codeMichael Niedermayer2013-12-111-0/+5
| | | | | | | | | | Fixess CID1135761 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc: fix null pointer dereference with invalid option stringsMichael Niedermayer2013-12-111-0/+4
| | | | | | | | | | Fixes CID1135760 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/avstring: fix () positionMichael Niedermayer2013-12-111-2/+2
| | | | | | | | | | | | Fixes CID1135751 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Check avcodec_open2() return code in av_find_stream_info()Michael Niedermayer2013-12-111-5/+6
| | | | | | | | | | | | Fixes CID1135750 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: fix off by 1 error in array size checkMichael Niedermayer2013-12-111-1/+1
| | | | | | | | | | | | Fixes CID1135763, CID1135764 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools/: Add gen-rc tool for generating Windows resource filesTimothy Gu2013-12-111-0/+121
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: fix unintentional integer overflow in hds_write_packet()Michael Niedermayer2013-12-111-1/+1
| | | | | | | | | | | | Fixes CID1135762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: Check rename() return valueMichael Niedermayer2013-12-111-3/+12
| | | | | | | | | | Fixes CID1135748 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: fix null dereference in avio_close_dyn_buf()Michael Niedermayer2013-12-111-1/+2
| | | | | | | | | | | | Fixes CID1135769 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/aeval: Fix use of uninitialized variableMichael Niedermayer2013-12-111-1/+1
| | | | | | | | | | | | Fixes CID1135776 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Print warning if avcodec_set_dimensions() failedMichael Niedermayer2013-12-111-1/+4
| | | | | | | | | | Fixes CID1135744 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream: remove unused variableMichael Niedermayer2013-12-111-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Force one stream for raw muxers.Carl Eugen Hoyos2013-12-111-0/+29
| | | | | | | | | | | | | | Based on eeb975f5 Fixes ticket #3217. Reviewed-by: Nicolas George
* | avformat/oggparseopus: calculate pts/dts for initial packets after seekingMichael Niedermayer2013-12-111-0/+30
| | | | | | | | | | | | based on code from oggparsevorbis Fixes Ticket3124 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseopus: factor opus_duration() outMichael Niedermayer2013-12-111-15/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-111-0/+5
|\| | | | | | | | | | | | | | | * qatar/master: alsdec: check block length See: 0ceca269b66ec12a23bf0907bd2c220513cdbf16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alsdec: check block lengthReinhard Tartler2013-12-101-0/+5
| | | | | | | | | | | | | | Fix writing over the end Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Addresses: CVE-2013-0845
* | avcodec/snowdec: check av_frame_ref() return valueMichael Niedermayer2013-12-111-2/+5
| | | | | | | | | | | | Fixes CID1135742 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: Fix memleak of AVCodecContext on errorMichael Niedermayer2013-12-111-0/+1
| | | | | | | | | | Fixes CID1135767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/indeo3: check the return code of ff_set_dimensions()Michael Niedermayer2013-12-111-1/+2
| | | | | | | | | | | | | | | | | | This is currently redundant as the checks before it are tighter than the checks in ff_set_dimensions() but its more robust not to depend on that. Fixes CID1135740 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>