Changeset 259a960f in ffmpeg

Timestamp:

Nov 4, 2011, 12:44:06 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

71f5712

Parents:

bb99ae3a (diff), 2a6eb062 (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: vp6: Fix illegal read. avfilter: Don't copy garbage from the stack when setting up video pictures. avcodec: Make sure codec_type is set by avcodec_get_context_defaults2 avcodec: Remove a misplaced and useless attribute_deprecated avconv: add -dump_attachment option. avconv: add -attach option. avconv: make negative mappings disable only streams from the specified file fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64

Conflicts:

libavcodec/options.c

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

(No files)