Changeset f2f99f0 in ffmpeg

Timestamp:

May 11, 2014, 9:28:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8d19dd91

Parents:

d93cf093 (diff), 5c1d724 (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 commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'

• commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f': lavc: set AVCodecContext.hwaccel in ff_get_format()

Conflicts:

libavcodec/mpeg12dec.c

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

(No files)