Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 09:25:46 +0000 (11:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 09:25:46 +0000 (11:25 +0200)
commit3b071a4390f02ecbeb993f16f93b01f4e420def8
treeef15b1e9d24f3ad9700c0a17ea770a45007a0230
parentf57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd
parenta030279a67ef883df8cf3707774656fa1be81078
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'

* commit 'a030279a67ef883df8cf3707774656fa1be81078':
  ljpeg: use the correct number of components in yuv

Conflicts:
libavcodec/mjpegdec.c

See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5

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