Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:48:20 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:48:20 +0000 (13:48 +0100)
commitfb98ca575d64452dba55a60c4ddf571163f0ca81
tree462efba501471ae7d9c4d8a634429724f614ceff
parent6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa
parentdaffed3b173c59d64907747bf3309e98a8974f4e
Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'

* commit 'daffed3b173c59d64907747bf3309e98a8974f4e':
  ljpegenc: accept bgr24 instead of bgra

Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c

Only whitespace merged, we continue to support both formats

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c