Changeset 4257ce11 in ffmpeg

Timestamp:

Mar 16, 2012, 12:36:49 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b89f9407

Parents:

c743aad5 (diff), 702985b8 (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.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: dxa: remove useless code lavf: don't select an attached picture as default stream for seeking. avconv: remove pointless checks. avconv: check for get_filtered_frame() failure. avconv: remove a pointless check. swscale: convert hscale() to use named arguments. x86inc: add *mp named argument support to DEFINE_ARGS. swscale: convert hscale to cpuflags().

Conflicts:

ffmpeg.c
libswscale/x86/scale.asm

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

(No files)