diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:24:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:27:53 +0200 |
| commit | 7aee08997813a0e9a366b0e68fc10180339315a4 (patch) | |
| tree | d848a10719003caceae0f7fe9c17005d1dbeeed4 /libavutil/samplefmt.c | |
| parent | c96786008172f669e546ca987e7aaa3c3469be71 (diff) | |
| parent | a3040715e1f0db1af0c27566a306c4a27ad07dcd (diff) | |
| download | ffmpeg-7aee08997813a0e9a366b0e68fc10180339315a4.tar.gz | |
Merge branch 'master' into oldabi
* master: (22 commits)
ffmpeg:Daemon mode, add -d as first option to try it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg:Fix negative verbositiy Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.
In mov and flv muxer, check aac bitstream validity.
Added key_frame and pict_type to vsrc_movie
Allow h264pred_init_arm.c to compile.
anm decoder: move buffer allocation from decode_init() to decode_frame()
vsrc_movie: fix leak in request_frame()
Replace mplayerhq.hu URLs by libav.org.
asfdec: Remove dead code from asf_read_close().
ptx: Use av_log_ask_for_sample() where appropriate.
Merge remote-tracking branch 'ffmpeg-mt/master'
10l, commit that should have been stashed into the merge. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Update regtest checksums after revision 6001dad.
Replace more FFmpeg references by Libav.
ac3dec: fix processing of delta bit allocation information.
vc1: fix fate-vc1 after previous commit.
wmv3dec: fix playback of complex WMV3 files using simple_idct.
Replace references to ffmpeg-devel with libav-devel; fix roundup URL.
make av_dup_packet() more cautious on allocation failures
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/samplefmt.c')
0 files changed, 0 insertions, 0 deletions