summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/ffv1enc: fix use of uninitalized variable in choose_rct_params()Michael Niedermayer2013-12-101-6/+7
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-101-45/+78
|\ | | | | | | | | | | | | | | | | | | * qatar/master: configure: Split host and target libc detection Conflicts: configure Merged-by: Michael Niedermayer <[email protected]>
| * configure: Split host and target libc detectionDiego Biurrun2013-12-091-40/+73
| |
* | Merge commit 'c869fcdeac3b7cd71a852b928902daadeca55685'Michael Niedermayer2013-12-101-3/+2
|\| | | | | | | | | | | | | * commit 'c869fcdeac3b7cd71a852b928902daadeca55685': configure: Move toolchain dependency declarations to a more appropriate place Merged-by: Michael Niedermayer <[email protected]>
| * configure: Move toolchain dependency declarations to a more appropriate placeDiego Biurrun2013-12-091-3/+2
| |
* | avcodec/utils: check that extended data has been set correctly instead of ↵Michael Niedermayer2013-12-101-1/+1
| | | | | | | | | | | | forcing it in avcodec_decode_video2() Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/libutvideodec: free coded_frame with av_frame_free() instead if av_free*Michael Niedermayer2013-12-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/libutvideodec: use av_frame_move_ref()Michael Niedermayer2013-12-101-1/+1
| | | | | | | | | | | | | | AVFrames cannot be copied literally, their definition is in avutil and their extended_data can point to their data[] Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/utils: dont depend on the channel layout in unrefcount_frame()Michael Niedermayer2013-12-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | doc: Fix adelay example.Carl Eugen Hoyos2013-12-091-1/+1
| | | | | | | | Fixes ticket #3211.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-093-2/+53
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information Conflicts: libavcodec/hevc.h libavcodec/hevc_sei.c Merged-by: Michael Niedermayer <[email protected]>
| * hevc: parse frame packing arrangement SEI messages and save relevant ↵Vittorio Giovara2013-12-093-5/+56
| | | | | | | | stereo3d information
* | Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'Michael Niedermayer2013-12-091-0/+41
|\| | | | | | | | | | | | | | | | | | | * commit '3d1d175367f1f22e0c4952299a258272e2e2acf1': mpeg12enc: set frame packing information when relevant metadata is found Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <[email protected]>
| * mpeg12enc: set frame packing information when relevant metadata is foundVittorio Giovara2013-12-091-0/+41
| |
* | Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'Michael Niedermayer2013-12-091-0/+32
|\| | | | | | | | | | | | | * commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc': mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information Merged-by: Michael Niedermayer <[email protected]>
| * mpeg12dec: parse frame packing arrangement user_data and save relevant ↵Vittorio Giovara2013-12-091-0/+32
| | | | | | | | stereo3d information
* | Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'Michael Niedermayer2013-12-091-1/+37
|\| | | | | | | | | | | | | | | | | | | * commit '09cb75cdeba420d680bcb165a1ef668d8f381fed': libx264: set frame packing information when relevant information is found Conflicts: libavcodec/libx264.c Merged-by: Michael Niedermayer <[email protected]>
| * libx264: set frame packing information when relevant information is foundVittorio Giovara2013-12-091-1/+37
| |
* | Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'Michael Niedermayer2013-12-093-24/+85
|\| | | | | | | | | | | | | | | | | | | | | * commit '5b10ef729f610fcbc9c485e7b643ce53268144cb': h264: parse frame packing arrangement SEI messages and save relevant stereo3d information Conflicts: libavcodec/h264.c libavcodec/h264_sei.c Merged-by: Michael Niedermayer <[email protected]>
| * h264: parse frame packing arrangement SEI messages and save relevant ↵Vittorio Giovara2013-12-093-1/+91
| | | | | | | | stereo3d information
* | Merge commit '7e244c68600f479270e979258e389ed5240885fb'Michael Niedermayer2013-12-097-1/+200
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7e244c68600f479270e979258e389ed5240885fb': avframe: add codec-independent stereoscopic metadata Conflicts: Changelog libavutil/Makefile libavutil/version.h Merged-by: Michael Niedermayer <[email protected]>
| * avframe: add codec-independent stereoscopic metadataVittorio Giovara2013-12-097-1/+200
| |
* | cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang2013-12-0911-27/+347
| | | | | | | | | | | | | | | | OpenCL devices Reviewed-by: Wei Gao <[email protected]> Reviewed-by: Stefano Sabatini <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-095-12/+11
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <[email protected]>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-095-12/+11
| | | | | | | | Simplifies host/target libc detection splitting.
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-12-092-3/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix remuxing of IMA_QT in mov. Do not detect "00000000..." (and other non-changing values) as adp. Merged-by: Michael Niedermayer <[email protected]>
| * | Fix remuxing of IMA_QT in mov.Carl Eugen Hoyos2013-12-091-1/+2
| | | | | | | | | | | | Fixes ticket #1603.
| * | Do not detect "00000000..." (and other non-changing values) as adp.Carl Eugen Hoyos2013-12-091-2/+9
| | |
* | | Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'Michael Niedermayer2013-12-091-1/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit '61b203ffe6c71789acb14f51483d63fe9e516842': configure: detect Solaris libc Merged-by: Michael Niedermayer <[email protected]>
| * | configure: detect Solaris libcSean McGovern2013-12-091-1/+3
| | | | | | | | | | | | | | | | | | Add preprocessor flags for API availability as necessary. Signed-off-by: Diego Biurrun <[email protected]>
* | | Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'Michael Niedermayer2013-12-0910-77/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c': avcodec: Use av_reallocp where suitable Conflicts: libavcodec/bitstream.c libavcodec/eatgv.c libavcodec/flashsv.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <[email protected]>
| * | avcodec: Use av_reallocp where suitableAlexandra Khirnova2013-12-0910-76/+73
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | | Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'Michael Niedermayer2013-12-094-41/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4f1188d1a662fed5347e70016da49e01563e8a8': dv: use AVFrame API properly Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <[email protected]>
| * | dv: use AVFrame API properlyAnton Khirnov2013-12-094-39/+38
| | |
* | | Merge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'Michael Niedermayer2013-12-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | * commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0': ac3dec: make drc_scale exponentially Merged-by: Michael Niedermayer <[email protected]>
| * | ac3dec: make drc_scale exponentiallyJohn Stebbins2013-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | The a52 spec suggests that "partial compression" should scale the drc value in this manner. Signed-off-by: Anton Khirnov <[email protected]>
* | | Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'Michael Niedermayer2013-12-092-18/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37a749012aaacc801fe860428417a6d7b81c103f': lavc: rework handling of refcounted_frames=0 Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * | lavc: rework handling of refcounted_frames=0Anton Khirnov2013-12-092-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use only proper AVFrame API (no assigning of whole frames, since that hardcodes sizeof(AVFrame) into lavc). Make a copy of the side data, so the caller can use av_frame_unref/free on non-refcounted frames, eliminating the need for avcodec_get_frame_defaults()/avcodec_free_frame().
* | | Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'Michael Niedermayer2013-12-091-23/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <[email protected]>
| * | frame: cosmetics, reindentAnton Khirnov2013-12-091-15/+15
| | |
* | | Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'Michael Niedermayer2013-12-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c342132fa8a29692e28c98238e3a31da5c407e42': frame: copy flags in av_frame_copy_props() Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <[email protected]>
| * | frame: copy flags in av_frame_copy_props()Anton Khirnov2013-12-091-0/+1
| | | | | | | | | | | | Flags can be considered metadata (at least those that are defined now).
* | | Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'Michael Niedermayer2013-12-091-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8': lavc/decode_video(): always unref the frame if there is no output in decode_video Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * | lavc/decode_video(): always unref the frame if there is no output in ↵Anton Khirnov2013-12-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | decode_video Not just on failure. This is the same thing that is done in the audio path and should prevent leaks in decoders that allocate a frame, but then end up not writing into it.
* | | Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'Michael Niedermayer2013-12-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | * commit '85f947aefb3dae81f65f518acdffa8e31c679654': lavc: remove a pointless check in decode_audio4() Merged-by: Michael Niedermayer <[email protected]>
| * | lavc: remove a pointless check in decode_audio4()Anton Khirnov2013-12-091-1/+1
| | | | | | | | | | | | av_frame_unref() works fine on unallocated frames.
* | | Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'Michael Niedermayer2013-12-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56': lavc: use buf[0] instead of data[0] as the indicator of an allocated frame Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * | lavc: use buf[0] instead of data[0] as the indicator of an allocated frameAnton Khirnov2013-12-091-1/+1
| | | | | | | | | | | | data[0] may be NULL for valid frames with hwaccel pixel formats.
* | | Merge commit 'e5419709f50593769037ab77d7102f82d9260784'Michael Niedermayer2013-12-091-13/+0
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | * commit 'e5419709f50593769037ab77d7102f82d9260784': lavc: remove the extended_data workarounds. Conflicts: libavcodec/utils.c One hunk is not merged as not all codecs are updated yet Merged-by: Michael Niedermayer <[email protected]>
| * lavc: remove the extended_data workarounds.Anton Khirnov2013-12-091-12/+0
| | | | | | | | All decoders should now handle it properly.