[FFmpeg-devel] [PATCH 1/2] lavf/ffm: silent deprecated warnings

Lukasz Marek lukasz.m.luki2 at gmail.com
Sun Nov 2 19:19:13 CET 2014


Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
---
 libavformat/ffmdec.c | 11 +++++++++++
 libavformat/ffmenc.c |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 448762b..e95c139 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/internal.h"
 #include "avformat.h"
 #include "internal.h"
 #include "ffm.h"
@@ -224,8 +225,10 @@ static int ffm_close(AVFormatContext *s)
 {
     int i;
 
+FF_DISABLE_DEPRECATION_WARNINGS
     for (i = 0; i < s->nb_streams; i++)
         av_freep(&s->streams[i]->codec->rc_eq);
+FF_ENABLE_DEPRECATION_WARNINGS
 
     return 0;
 }
@@ -310,7 +313,9 @@ static int ffm2_read_header(AVFormatContext *s)
                 codec->qblur = avio_rb16(pb) / 10000.0;
                 codec->bit_rate_tolerance = avio_rb32(pb);
                 avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf));
+FF_DISABLE_DEPRECATION_WARNINGS
                 codec->rc_eq = av_strdup(rc_eq_buf);
+FF_ENABLE_DEPRECATION_WARNINGS
                 codec->rc_max_rate = avio_rb32(pb);
                 codec->rc_min_rate = avio_rb32(pb);
                 codec->rc_buffer_size = avio_rb32(pb);
@@ -327,7 +332,9 @@ static int ffm2_read_header(AVFormatContext *s)
                 codec->mb_decision = avio_rb32(pb);
                 codec->nsse_weight = avio_rb32(pb);
                 codec->frame_skip_cmp = avio_rb32(pb);
+FF_DISABLE_DEPRECATION_WARNINGS
                 codec->rc_buffer_aggressivity = av_int2double(avio_rb64(pb));
+FF_ENABLE_DEPRECATION_WARNINGS
                 codec->codec_tag = avio_rb32(pb);
                 codec->thread_count = avio_r8(pb);
                 codec->coder_type = avio_rb32(pb);
@@ -434,7 +441,9 @@ static int ffm_read_header(AVFormatContext *s)
             codec->qblur = avio_rb16(pb) / 10000.0;
             codec->bit_rate_tolerance = avio_rb32(pb);
             avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf));
+FF_DISABLE_DEPRECATION_WARNINGS
             codec->rc_eq = av_strdup(rc_eq_buf);
+FF_ENABLE_DEPRECATION_WARNINGS
             codec->rc_max_rate = avio_rb32(pb);
             codec->rc_min_rate = avio_rb32(pb);
             codec->rc_buffer_size = avio_rb32(pb);
@@ -451,7 +460,9 @@ static int ffm_read_header(AVFormatContext *s)
             codec->mb_decision = avio_rb32(pb);
             codec->nsse_weight = avio_rb32(pb);
             codec->frame_skip_cmp = avio_rb32(pb);
+FF_DISABLE_DEPRECATION_WARNINGS
             codec->rc_buffer_aggressivity = av_int2double(avio_rb64(pb));
+FF_ENABLE_DEPRECATION_WARNINGS
             codec->codec_tag = avio_rb32(pb);
             codec->thread_count = avio_r8(pb);
             codec->coder_type = avio_rb32(pb);
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index eb809eb..7528dbf 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -23,6 +23,7 @@
 #include "libavutil/intfloat.h"
 #include "libavutil/avassert.h"
 #include "libavutil/parseutils.h"
+#include "libavutil/internal.h"
 #include "avformat.h"
 #include "internal.h"
 #include "ffm.h"
@@ -165,7 +166,9 @@ static int ffm_write_header(AVFormatContext *s)
             avio_wb16(pb, (int) (codec->qcompress * 10000.0));
             avio_wb16(pb, (int) (codec->qblur * 10000.0));
             avio_wb32(pb, codec->bit_rate_tolerance);
+FF_DISABLE_DEPRECATION_WARNINGS
             avio_put_str(pb, codec->rc_eq ? codec->rc_eq : "tex^qComp");
+FF_ENABLE_DEPRECATION_WARNINGS
             avio_wb32(pb, codec->rc_max_rate);
             avio_wb32(pb, codec->rc_min_rate);
             avio_wb32(pb, codec->rc_buffer_size);
@@ -182,7 +185,9 @@ static int ffm_write_header(AVFormatContext *s)
             avio_wb32(pb, codec->mb_decision);
             avio_wb32(pb, codec->nsse_weight);
             avio_wb32(pb, codec->frame_skip_cmp);
+FF_DISABLE_DEPRECATION_WARNINGS
             avio_wb64(pb, av_double2int(codec->rc_buffer_aggressivity));
+FF_ENABLE_DEPRECATION_WARNINGS
             avio_wb32(pb, codec->codec_tag);
             avio_w8(pb, codec->thread_count);
             avio_wb32(pb, codec->coder_type);
-- 
1.9.1



More information about the ffmpeg-devel mailing list