armv4l/float_arm_vfp.o must be added to OBJS-$(HAVE_ARMVFP) list since

[ffmpeg] / libavformat / 4xm.c

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index d3771672649fbbc68922ad4d7489ff02f72bf543..151e9c9c810016fdcd23a8b0d2ae78705361d4db 100644 (file)
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -44,6 +44,9 @@
 #define  ifrm_TAG MKTAG('i', 'f', 'r', 'm')
 #define  pfrm_TAG MKTAG('p', 'f', 'r', 'm')
 #define  cfrm_TAG MKTAG('c', 'f', 'r', 'm')
+#define  ifr2_TAG MKTAG('i', 'f', 'r', '2')
+#define  pfr2_TAG MKTAG('p', 'f', 'r', '2')
+#define  cfr2_TAG MKTAG('c', 'f', 'r', '2')
 #define  snd__TAG MKTAG('s', 'n', 'd', '_')
 
 #define vtrk_SIZE 0x44
@@ -89,7 +92,7 @@ static int fourxm_probe(AVProbeData *p)
 static int fourxm_read_header(AVFormatContext *s,
                               AVFormatParameters *ap)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned int fourcc_tag;
     unsigned int size;
     int header_size;
@@ -118,7 +121,7 @@ static int fourxm_read_header(AVFormatContext *s,
     if (!header)
         return AVERROR(ENOMEM);
     if (get_buffer(pb, header, header_size) != header_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* take the lazy approach and search for any and all vtrk and strk chunks */
     for (i = 0; i < header_size - 8; i++) {
@@ -135,7 +138,6 @@ static int fourxm_read_header(AVFormatContext *s,
             }
             fourxm->width = AV_RL32(&header[i + 36]);
             fourxm->height = AV_RL32(&header[i + 40]);
-            i += 8 + size;
 
             /* allocate a new AVStream */
             st = av_new_stream(s, 0);
@@ -147,10 +149,13 @@ static int fourxm_read_header(AVFormatContext *s,
 
             st->codec->codec_type = CODEC_TYPE_VIDEO;
             st->codec->codec_id = CODEC_ID_4XM;
-            st->codec->codec_tag = 0;  /* no fourcc */
+            st->codec->extradata_size = 4;
+            st->codec->extradata = av_malloc(4);
+            AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16]));
             st->codec->width = fourxm->width;
             st->codec->height = fourxm->height;
 
+            i += 8 + size;
         } else if (fourcc_tag == strk_TAG) {
             /* check that there is enough data */
             if (size != strk_SIZE) {
@@ -219,7 +224,7 @@ static int fourxm_read_packet(AVFormatContext *s,
                               AVPacket *pkt)
 {
     FourxmDemuxContext *fourxm = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     unsigned int fourcc_tag;
     unsigned int size, out_size;
     int ret = 0;
@@ -230,12 +235,12 @@ static int fourxm_read_packet(AVFormatContext *s,
 
     while (!packet_read) {
 
-        if ((ret = get_buffer(&s->pb, header, 8)) < 0)
+        if ((ret = get_buffer(s->pb, header, 8)) < 0)
             return ret;
         fourcc_tag = AV_RL32(&header[0]);
         size = AV_RL32(&header[4]);
         if (url_feof(pb))
-            return AVERROR_IO;
+            return AVERROR(EIO);
         switch (fourcc_tag) {
 
         case LIST_TAG:
@@ -248,17 +253,21 @@ static int fourxm_read_packet(AVFormatContext *s,
 
         case ifrm_TAG:
         case pfrm_TAG:
-        case cfrm_TAG:{
+        case cfrm_TAG:
+        case ifr2_TAG:
+        case pfr2_TAG:
+        case cfr2_TAG:
+        {
 
             /* allocate 8 more bytes than 'size' to account for fourcc
              * and size */
             if (size + 8 < size || av_new_packet(pkt, size + 8))
-                return AVERROR_IO;
+                return AVERROR(EIO);
             pkt->stream_index = fourxm->video_stream_index;
             pkt->pts = fourxm->video_pts;
-            pkt->pos = url_ftell(&s->pb);
+            pkt->pos = url_ftell(s->pb);
             memcpy(pkt->data, header, 8);
-            ret = get_buffer(&s->pb, &pkt->data[8], size);
+            ret = get_buffer(s->pb, &pkt->data[8], size);
 
             if (ret < 0)
                 av_free_packet(pkt);
@@ -273,9 +282,9 @@ static int fourxm_read_packet(AVFormatContext *s,
             size-=8;
 
             if (track_number == fourxm->selected_track) {
-                ret= av_get_packet(&s->pb, pkt, size);
+                ret= av_get_packet(s->pb, pkt, size);
                 if(ret<0)
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
                 pkt->stream_index =
                     fourxm->tracks[fourxm->selected_track].stream_index;
                 pkt->pts = fourxm->audio_pts;