Changeset f4f7888 in ffmpeg

Timestamp:

Nov 17, 2013, 11:41:42 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

be1e6e75

Parents:

a0c0629d (diff), ffe04c3 (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 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'

• commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa': libxvid: use the AVFrame API properly. pcxenc: use the AVFrame API properly. roqvideo: remove unused variables libschroedingerenc: use the AVFrame API properly.

Conflicts:

libavcodec/pcxenc.c

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

(No files)