[FFmpeg-cvslog] mjpegdec: support more pix_fmt_ids for grayscale

[Piotr Bandurski]

ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Sat Dec  8 17:34:10 2012 +0100| [e5550c0d0971e393ba221cd69506acd2c2dab89c] | committer: Michael Niedermayer

mjpegdec: support more pix_fmt_ids for grayscale

samples created with

"cjpeg -grayscale -sample 1x3 / 1x4 / 3x1 / 3x3 / 4x1 / 4x3 / 4x4"

http://www.datafilehost.com/download-d828329d.html

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5550c0d0971e393ba221cd69506acd2c2dab89c
---

 libavcodec/mjpegdec.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index b0dd85e..cb500d4 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -388,6 +388,14 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         s->chroma_height = s->height / 2;
         break;
     case 0x11000000:
+    case 0x13000000:
+    case 0x14000000:
+    case 0x31000000:
+    case 0x33000000:
+    case 0x34000000:
+    case 0x41000000:
+    case 0x43000000:
+    case 0x44000000:
         if(s->bits <= 8)
             s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
         else