Changeset 5231eecd in ffmpeg

Timestamp:

Nov 14, 2013, 2:26:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bae14f3

Parents:

e25ed260 (diff), 19e30a58 (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> (11/14/13 02:13:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/14/13 02:26:35)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Deprecate obsolete XvMC hardware decoding support

Conflicts:

libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h

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

(No files)