nutdec: fix memleaks on error in nut_read_header

[ffmpeg] / libavformat / r3d.c

diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 6dda1746dded741cb955c7cc488d88f858a6a3a6..f220e3d9c0b5d3ad5f68b9108e025a496cd4e397 100644 (file)
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -44,7 +44,7 @@ static int read_atom(AVFormatContext *s, Atom *atom)
     if (atom->size < 8)
         return -1;
     atom->tag = avio_rl32(s->pb);
-    av_dlog(s, "atom %u %.4s offset %#"PRIx64"\n",
+    av_log(s, AV_LOG_TRACE, "atom %u %.4s offset %#"PRIx64"\n",
             atom->size, (char*)&atom->tag, atom->offset);
     return atom->size;
 }
@@ -64,16 +64,16 @@ static int r3d_read_red1(AVFormatContext *s)
 
     tmp  = avio_r8(s->pb); // major version
     tmp2 = avio_r8(s->pb); // minor version
-    av_dlog(s, "version %d.%d\n", tmp, tmp2);
+    av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
 
     tmp = avio_rb16(s->pb); // unknown
-    av_dlog(s, "unknown1 %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "unknown1 %d\n", tmp);
 
     tmp = avio_rb32(s->pb);
     avpriv_set_pts_info(st, 32, 1, tmp);
 
     tmp = avio_rb32(s->pb); // filenum
-    av_dlog(s, "filenum %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "filenum %d\n", tmp);
 
     avio_skip(s->pb, 32); // unknown
 
@@ -81,7 +81,7 @@ static int r3d_read_red1(AVFormatContext *s)
     st->codec->height = avio_rb32(s->pb);
 
     tmp = avio_rb16(s->pb); // unknown
-    av_dlog(s, "unknown2 %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "unknown2 %d\n", tmp);
 
     framerate.num = avio_rb16(s->pb);
     framerate.den = avio_rb16(s->pb);
@@ -93,7 +93,7 @@ static int r3d_read_red1(AVFormatContext *s)
     }
 
     tmp = avio_r8(s->pb); // audio channels
-    av_dlog(s, "audio channels %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "audio channels %d\n", tmp);
     if (tmp > 0) {
         AVStream *ast = avformat_new_stream(s, NULL);
         if (!ast)
@@ -108,10 +108,10 @@ static int r3d_read_red1(AVFormatContext *s)
     filename[sizeof(filename)-1] = 0;
     av_dict_set(&st->metadata, "filename", filename, 0);
 
-    av_dlog(s, "filename %s\n", filename);
-    av_dlog(s, "resolution %dx%d\n", st->codec->width, st->codec->height);
-    av_dlog(s, "timescale %d\n", st->time_base.den);
-    av_dlog(s, "frame rate %d/%d\n",
+    av_log(s, AV_LOG_TRACE, "filename %s\n", filename);
+    av_log(s, AV_LOG_TRACE, "resolution %dx%d\n", st->codec->width, st->codec->height);
+    av_log(s, AV_LOG_TRACE, "timescale %d\n", st->time_base.den);
+    av_log(s, AV_LOG_TRACE, "frame rate %d/%d\n",
             framerate.num, framerate.den);
 
     return 0;
@@ -134,14 +134,14 @@ static int r3d_read_rdvo(AVFormatContext *s, Atom *atom)
             r3d->video_offsets_count = i;
             break;
         }
-        av_dlog(s, "video offset %d: %#x\n", i, r3d->video_offsets[i]);
+        av_log(s, AV_LOG_TRACE, "video offset %d: %#x\n", i, r3d->video_offsets[i]);
     }
 
     if (st->avg_frame_rate.num)
         st->duration = av_rescale_q(r3d->video_offsets_count,
                                     av_inv_q(st->avg_frame_rate),
                                     st->time_base);
-    av_dlog(s, "duration %"PRId64"\n", st->duration);
+    av_log(s, AV_LOG_TRACE, "duration %"PRId64"\n", st->duration);
 
     return 0;
 }
@@ -157,10 +157,10 @@ static void r3d_read_reos(AVFormatContext *s)
     avio_rb32(s->pb); // rdas offset
 
     tmp = avio_rb32(s->pb);
-    av_dlog(s, "num video chunks %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "num video chunks %d\n", tmp);
 
     tmp = avio_rb32(s->pb);
-    av_dlog(s, "num audio chunks %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "num audio chunks %d\n", tmp);
 
     avio_skip(s->pb, 6*4);
 }
@@ -186,7 +186,7 @@ static int r3d_read_header(AVFormatContext *s)
     }
 
     s->internal->data_offset = avio_tell(s->pb);
-    av_dlog(s, "data offset %#"PRIx64"\n", s->internal->data_offset);
+    av_log(s, AV_LOG_TRACE, "data offset %#"PRIx64"\n", s->internal->data_offset);
     if (!s->pb->seekable)
         return 0;
     // find REOB/REOF/REOS to load index
@@ -228,29 +228,29 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
     dts = avio_rb32(s->pb);
 
     tmp = avio_rb32(s->pb);
-    av_dlog(s, "frame num %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "frame num %d\n", tmp);
 
     tmp  = avio_r8(s->pb); // major version
     tmp2 = avio_r8(s->pb); // minor version
-    av_dlog(s, "version %d.%d\n", tmp, tmp2);
+    av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
 
     tmp = avio_rb16(s->pb); // unknown
-    av_dlog(s, "unknown %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
 
     if (tmp > 4) {
         tmp = avio_rb16(s->pb); // unknown
-        av_dlog(s, "unknown %d\n", tmp);
+        av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
 
         tmp = avio_rb16(s->pb); // unknown
-        av_dlog(s, "unknown %d\n", tmp);
+        av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
 
         tmp = avio_rb32(s->pb);
-        av_dlog(s, "width %d\n", tmp);
+        av_log(s, AV_LOG_TRACE, "width %d\n", tmp);
         tmp = avio_rb32(s->pb);
-        av_dlog(s, "height %d\n", tmp);
+        av_log(s, AV_LOG_TRACE, "height %d\n", tmp);
 
         tmp = avio_rb32(s->pb);
-        av_dlog(s, "metadata len %d\n", tmp);
+        av_log(s, AV_LOG_TRACE, "metadata len %d\n", tmp);
     }
     tmp = atom->size - 8 - (avio_tell(s->pb) - pos);
     if (tmp < 0)
@@ -266,7 +266,7 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
     if (st->avg_frame_rate.num)
         pkt->duration = (uint64_t)st->time_base.den*
             st->avg_frame_rate.den/st->avg_frame_rate.num;
-    av_dlog(s, "pkt dts %"PRId64" duration %d\n", pkt->dts, pkt->duration);
+    av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %d\n", pkt->dts, pkt->duration);
 
     return 0;
 }
@@ -291,17 +291,17 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
     samples = avio_rb32(s->pb);
 
     tmp = avio_rb32(s->pb);
-    av_dlog(s, "packet num %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "packet num %d\n", tmp);
 
     tmp = avio_rb16(s->pb); // unknown
-    av_dlog(s, "unknown %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
 
     tmp  = avio_r8(s->pb); // major version
     tmp2 = avio_r8(s->pb); // minor version
-    av_dlog(s, "version %d.%d\n", tmp, tmp2);
+    av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
 
     tmp = avio_rb32(s->pb); // unknown
-    av_dlog(s, "unknown %d\n", tmp);
+    av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
 
     size = atom->size - 8 - (avio_tell(s->pb) - pos);
     if (size < 0)
@@ -316,7 +316,7 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
     pkt->dts = dts;
     if (st->codec->sample_rate)
         pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
-    av_dlog(s, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n",
+    av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n",
             pkt->dts, pkt->duration, samples, st->codec->sample_rate);
 
     return 0;
@@ -373,7 +373,7 @@ static int r3d_seek(AVFormatContext *s, int stream_index, int64_t sample_time, i
 
     frame_num = av_rescale_q(sample_time, st->time_base,
                              av_inv_q(st->avg_frame_rate));
-    av_dlog(s, "seek frame num %d timestamp %"PRId64"\n",
+    av_log(s, AV_LOG_TRACE, "seek frame num %d timestamp %"PRId64"\n",
             frame_num, sample_time);
 
     if (frame_num < r3d->video_offsets_count) {