Changeset cc4a6435 in ffmpeg

Timestamp:

Nov 16, 2013, 11:11:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

21c41e76

Parents:

29c83d23 (diff), 6139f48 (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 '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'

• commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf': asvenc: use the AVFrame API properly. a64multienc: use the AVFrame API properly.

Conflicts:

libavcodec/vaapi_mpeg.c

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

(No files)