[FFmpeg-cvslog] r16074 - trunk/libavcodec/mjpega_dump_header_bsf.c

[bcoudurier]

Author: bcoudurier
Date: Fri Dec 12 02:40:00 2008
New Revision: 16074

Log:
fix mjpega bitfilter when dht, dqt, sof0 are not ordered as expected, patch by Jay Freeman, saurik at saurik com

Modified:
   trunk/libavcodec/mjpega_dump_header_bsf.c

Modified: trunk/libavcodec/mjpega_dump_header_bsf.c
==============================================================================
--- trunk/libavcodec/mjpega_dump_header_bsf.c	(original)
+++ trunk/libavcodec/mjpega_dump_header_bsf.c	Fri Dec 12 02:40:00 2008
@@ -35,6 +35,7 @@ static int mjpega_dump_header(AVBitStrea
                               const uint8_t *buf, int buf_size, int keyframe)
 {
     uint8_t *poutbufp;
+    unsigned dqt = 0, dht = 0, sof0 = 0;
     int i;
 
     if (avctx->codec_id != CODEC_ID_MJPEG) {
@@ -59,12 +60,13 @@ static int mjpega_dump_header(AVBitStrea
     for (i = 0; i < buf_size - 1; i++) {
         if (buf[i] == 0xff) {
             switch (buf[i + 1]) {
-            case DQT:  /* quant off */
-            case DHT:  /* huff  off */
-            case SOF0: /* image off */
-                bytestream_put_be32(&poutbufp, i + 46);
-                break;
+            case DQT:  dqt  = i + 46; break;
+            case DHT:  dht  = i + 46; break;
+            case SOF0: sof0 = i + 46; break;
             case SOS:
+                bytestream_put_be32(&poutbufp, dqt); /* quant off */
+                bytestream_put_be32(&poutbufp, dht); /* huff off */
+                bytestream_put_be32(&poutbufp, sof0); /* image off */
                 bytestream_put_be32(&poutbufp, i + 46); /* scan off */
                 bytestream_put_be32(&poutbufp, i + 46 + AV_RB16(buf + i + 2)); /* data off */
                 bytestream_put_buffer(&poutbufp, buf + 2, buf_size - 2); /* skip already written SOI */