avformat/mpegts: Add missing constants for MPEG-TS stream_id definitions

[ffmpeg] / libavformat / bmv.c

diff --git a/libavformat/bmv.c b/libavformat/bmv.c
index ac567c21eb63541fadc7fd4cc77f405895dc8e88..873ecb027cf3fee13ba087ad92331aa675fc3abe 100644 (file)
--- a/libavformat/bmv.c
+++ b/libavformat/bmv.c
@@ -96,8 +96,8 @@ static int bmv_read_packet(AVFormatContext *s, AVPacket *pkt)
                        audio_size, c->size);
                 return AVERROR_INVALIDDATA;
             }
-            if (av_new_packet(pkt, audio_size) < 0)
-                return AVERROR(ENOMEM);
+            if ((err = av_new_packet(pkt, audio_size)) < 0)
+                return err;
             memcpy(pkt->data, c->packet + 1, pkt->size);
             pkt->stream_index = 1;
             pkt->pts          = c->audio_pos;
@@ -108,8 +108,8 @@ static int bmv_read_packet(AVFormatContext *s, AVPacket *pkt)
         } else
             break;
     }
-    if (av_new_packet(pkt, c->size + 1) < 0)
-        return AVERROR(ENOMEM);
+    if ((err = av_new_packet(pkt, c->size + 1)) < 0)
+        return err;
     pkt->stream_index = 0;
     c->get_next = 1;
     memcpy(pkt->data, c->packet, pkt->size);
@@ -125,7 +125,7 @@ static int bmv_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat ff_bmv_demuxer = {
+const AVInputFormat ff_bmv_demuxer = {
     .name           = "bmv",
     .long_name      = NULL_IF_CONFIG_SMALL("Discworld II BMV"),
     .priv_data_size = sizeof(BMVContext),