Changeset 052f4f85 in ffmpeg

Timestamp:

Jun 26, 2012, 9:57:07 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5916bc46

Parents:

37b5959d (diff), a5e8c41c (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> (06/26/12 21:27:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/26/12 21:57:07)

Message:

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

• commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build

Conflicts:

ffmpeg.c
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)