Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2014-03-14 11:52:28 +01:00

parent dded5ed9c5 2e708f1708

commit 0c402810fa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available