codec_tag settable via VideoTag, and transmit codec_tag in ffm

Originally committed as revision 8071 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 5 insertions, 0 deletions

diff --git a/ffserver.c b/ffserver.c
index 394134b373..94751e7db7 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4146,6 +4146,11 @@ static int parse_ffconfig(const char *filename)
                 video_enc.mb_decision = FF_MB_DECISION_BITS; //FIXME remove
                 video_enc.flags |= CODEC_FLAG_4MV;
             }
+        } else if (!strcasecmp(cmd, "VideoTag")) {
+            get_arg(arg, sizeof(arg), &p);
+            if ((strlen(arg) == 4) && stream) {
+                video_enc.codec_tag = ff_get_fourcc(arg);
+            }
         } else if (!strcasecmp(cmd, "BitExact")) {
             if (stream) {
                 video_enc.flags |= CODEC_FLAG_BITEXACT;