Changeset a0c0629d in ffmpeg

Timestamp:

Nov 17, 2013, 11:33:27 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f4f7888

Parents:

5b0c70c2 (diff), 97168b2 (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 '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'

• commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476': eatgv: use the AVFrame API properly. libxavs: use the AVFrame API properly. nuv: use the AVFrame API properly. flashsvenc: use the AVFrame API properly.

Conflicts:

libavcodec/eatgv.c
libavcodec/nuv.c

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

(No files)