lavf/mxfenc: better error handling with invalid frame rate.

[ffmpeg] / libavformat / mmf.c

diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 6240e49bee56d09f65f9cfcd32c922ccc315c5a4..18b69d471f51503d9c21b2c07c584d02de490c00 100644 (file)
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -246,7 +246,7 @@ static int mmf_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA;
+    st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
     st->codec->sample_rate = rate;
     st->codec->channels = 1;
     st->codec->bits_per_coded_sample = 4;
@@ -275,17 +275,13 @@ static int mmf_read_packet(AVFormatContext *s,
     if(!size)
         return AVERROR(EIO);
 
-    if (av_new_packet(pkt, size))
-        return AVERROR(EIO);
-    pkt->stream_index = 0;
-
-    ret = avio_read(s->pb, pkt->data, pkt->size);
+    ret = av_get_packet(s->pb, pkt, size);
     if (ret < 0)
-        av_free_packet(pkt);
+        return ret;
 
+    pkt->stream_index = 0;
     mmf->data_size -= ret;
 
-    pkt->size = ret;
     return ret;
 }
 
@@ -307,8 +303,8 @@ AVOutputFormat ff_mmf_muxer = {
     .mime_type         = "application/vnd.smaf",
     .extensions        = "mmf",
     .priv_data_size    = sizeof(MMFContext),
-    .audio_codec       = CODEC_ID_ADPCM_YAMAHA,
-    .video_codec       = CODEC_ID_NONE,
+    .audio_codec       = AV_CODEC_ID_ADPCM_YAMAHA,
+    .video_codec       = AV_CODEC_ID_NONE,
     .write_header      = mmf_write_header,
     .write_packet      = mmf_write_packet,
     .write_trailer     = mmf_write_trailer,