[FFmpeg-cvslog] ffserver_config: dont pass pointer to enum as pointer to int

Lukasz Marek git at videolan.org
Sun Nov 2 00:07:57 CET 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sat Nov  1 02:59:59 2014 +0100| [e9899ca3ddc1c1d2fda526b6fc958ab77fe79adb] | committer: Lukasz Marek

ffserver_config: dont pass pointer to enum as pointer to int

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9899ca3ddc1c1d2fda526b6fc958ab77fe79adb
---

 ffserver_config.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ffserver_config.c b/ffserver_config.c
index d589ff2..8d93d74 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -594,8 +594,11 @@ static int ffserver_apply_stream_config(AVCodecContext *enc, const AVDictionary
         ffserver_set_int_param(&enc->width, e->value, 0, INT_MIN, INT_MAX, NULL, 0, NULL);
     if ((e = av_dict_get(conf, "VideoSizeHeight", NULL, 0)))
         ffserver_set_int_param(&enc->height, e->value, 0, INT_MIN, INT_MAX, NULL, 0, NULL);
-    if ((e = av_dict_get(conf, "PixelFormat", NULL, 0)))
-        ffserver_set_int_param(&enc->pix_fmt, e->value, 0, INT_MIN, INT_MAX, NULL, 0, NULL);
+    if ((e = av_dict_get(conf, "PixelFormat", NULL, 0))) {
+        int val;
+        ffserver_set_int_param(&val, e->value, 0, INT_MIN, INT_MAX, NULL, 0, NULL);
+        enc->pix_fmt = val;
+    }
     if ((e = av_dict_get(conf, "VideoGopSize", NULL, 0)))
         ffserver_set_int_param(&enc->gop_size, e->value, 0, INT_MIN, INT_MAX, NULL, 0, NULL);
     if ((e = av_dict_get(conf, "VideoFrameRateNum", NULL, 0)))



More information about the ffmpeg-cvslog mailing list