Changeset 0c402810 in ffmpeg

Timestamp:

Mar 14, 2014, 10:52:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b5bdd04f

Parents:

dded5ed9 (diff), 2e708f17 (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 '2e708f17083fc41f10161f2406d57ec154c75468'

• commit '2e708f17083fc41f10161f2406d57ec154c75468': ljpeg: fix duplicated pixel format entry

Conflicts:

libavcodec/ljpegenc.c

No change as there was no duplicate entry in ffmpeg

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

(No files)