Changeset 5b0c70c2 in ffmpeg

Timestamp:

Nov 17, 2013, 11:19:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a0c0629d

Parents:

3ea168ed (diff), 57e7b3a8 (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/17/13 11:17:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/17/13 11:19:55)

Message:

Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'

• commit '57e7b3a89f5a0879ad039e8f04273b48649799a8': dnxhdenc: use the AVFrame API properly. libx264: use the AVFrame API properly. svq1enc: use the AVFrame API properly. gif: use the AVFrame API properly.

Conflicts:

libavcodec/gif.c
libavcodec/svq1enc.c

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

(No files)