Changeset 7aee0899 in ffmpeg

Timestamp:

Apr 19, 2011, 12:27:53 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Children:

9d7244c4

Parents:

c9678600 (diff), a3040715 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/19/11 00:24:03)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/19/11 00:27:53)

Message:

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>

(No files)