[FFmpeg-cvslog] ffserver: allow choosing the pixel format

Alexey Balekhov git at videolan.org
Sat Sep 14 04:00:26 CEST 2013


ffmpeg | branch: master | Alexey Balekhov <a at balek.ru> | Sat Sep 14 03:51:45 2013 +0200| [90ca8142673697980a740ea2f723aa7a6d13b267] | committer: Michael Niedermayer

ffserver: allow choosing the pixel format

Fixes Ticket2954

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffserver.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ffserver.c b/ffserver.c
index 4215265..6aaaeaf 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -48,6 +48,7 @@
 #include "libavutil/dict.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/pixdesc.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/opt.h"
@@ -4425,6 +4426,14 @@ static int parse_ffconfig(const char *filename)
                     video_enc.time_base.den = frame_rate.num;
                 }
             }
+        } else if (!av_strcasecmp(cmd, "PixelFormat")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                video_enc.pix_fmt = av_get_pix_fmt(arg);
+                if (video_enc.pix_fmt == AV_PIX_FMT_NONE) {
+                    ERROR("Unknown pixel format: %s\n", arg);
+                }
+            }
         } else if (!av_strcasecmp(cmd, "VideoGopSize")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream)



More information about the ffmpeg-cvslog mailing list