rmdec: check av_new_packet return value

[ffmpeg] / libavformat / wavenc.c

diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index d5e572fd2fb0decc43bf2ac3eb71d4006abc50df..25f6ffcde0ac28d212adcb9d2e986725998e1c1f 100644 (file)
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -36,6 +36,7 @@
 typedef struct WAVMuxContext {
     const AVClass *class;
     int64_t data;
+    int64_t fact_pos;
     int64_t minpts;
     int64_t maxpts;
     int last_duration;
@@ -100,7 +101,7 @@ static int wav_write_header(AVFormatContext *s)
 {
     WAVMuxContext *wav = s->priv_data;
     AVIOContext *pb = s->pb;
-    int64_t fmt, fact;
+    int64_t fmt;
 
     ffio_wfourcc(pb, "RIFF");
     avio_wl32(pb, 0); /* file length */
@@ -109,17 +110,18 @@ static int wav_write_header(AVFormatContext *s)
     /* format header */
     fmt = ff_start_tag(pb, "fmt ");
     if (ff_put_wav_header(pb, s->streams[0]->codec) < 0) {
+        const AVCodecDescriptor *desc = avcodec_descriptor_get(s->streams[0]->codec->codec_id);
         av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n",
-               s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE");
-        return -1;
+               desc ? desc->name : "unknown");
+        return AVERROR(ENOSYS);
     }
     ff_end_tag(pb, fmt);
 
     if (s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
         && s->pb->seekable) {
-        fact = ff_start_tag(pb, "fact");
+        wav->fact_pos = ff_start_tag(pb, "fact");
         avio_wl32(pb, 0);
-        ff_end_tag(pb, fact);
+        ff_end_tag(pb, wav->fact_pos);
     }
 
     if (wav->write_bext)
@@ -179,7 +181,7 @@ static int wav_write_trailer(AVFormatContext *s)
             number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration,
                                            s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num,
                                            s->streams[0]->time_base.den);
-            avio_seek(pb, wav->data-12, SEEK_SET);
+            avio_seek(pb, wav->fact_pos, SEEK_SET);
             avio_wl32(pb, number_of_samples);
             avio_seek(pb, file_size, SEEK_SET);
             avio_flush(pb);