Mercurial > libavformat.hg

changeset 6001:030495219c5c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move handling of paletted data to the IFF demuxer. This allows future handling of things such as masking/EHB/HAM for this type of data. Patch by Sebastian Vater <cdgs basty googlemail com>.
author rbultje
date Thu, 13 May 2010 15:39:40 +0000
parents b6114dd198a9
children 5b6f32f1546f
files iff.c
diffstat 1 files changed, 0 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/iff.c	Wed May 12 22:17:29 2010 +0000
+++ b/iff.c	Thu May 13 15:39:40 2010 +0000
@@ -256,13 +256,7 @@
     case AVMEDIA_TYPE_VIDEO:
         switch (compression) {
         case BITMAP_RAW:
-            if (st->codec->codec_tag == ID_ILBM) {
                 st->codec->codec_id = CODEC_ID_IFF_ILBM;
-            } else {
-                st->codec->codec_id = CODEC_ID_RAWVIDEO;
-                st->codec->pix_fmt  = PIX_FMT_PAL8;
-                st->codec->codec_tag = 0;
-            }
             break;
         case BITMAP_BYTERUN1:
             st->codec->codec_id = CODEC_ID_IFF_BYTERUN1;
@@ -299,18 +293,6 @@
             return AVERROR(ENOMEM);
         }
         interleave_stereo(sample_buffer, pkt->data, PACKET_SIZE);
-    } else if (st->codec->codec_id == CODEC_ID_RAWVIDEO) {
-        if(av_new_packet(pkt, iff->body_size + AVPALETTE_SIZE) < 0) {
-            return AVERROR(ENOMEM);
-        }
-
-        ret = ff_cmap_read_palette(st->codec, (uint32_t*)(pkt->data + iff->body_size));
-        if (ret < 0)
-            return ret;
-        av_freep(&st->codec->extradata);
-        st->codec->extradata_size = 0;
-
-        ret = get_buffer(pb, pkt->data, iff->body_size);
     } else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
         ret = av_get_packet(pb, pkt, iff->body_size);
     } else {