[Ffmpeg-cvslog] r8071 - in trunk: ffserver.c libavformat/ffm.c

[alex]

Author: alex
Date: Thu Feb 22 14:23:38 2007
New Revision: 8071

Modified:
   trunk/ffserver.c
   trunk/libavformat/ffm.c

Log:
codec_tag settable via VideoTag, and transmit codec_tag in ffm

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Thu Feb 22 14:23:38 2007
@@ -4146,6 +4146,11 @@
                 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;

Modified: trunk/libavformat/ffm.c
==============================================================================
--- trunk/libavformat/ffm.c	(original)
+++ trunk/libavformat/ffm.c	Thu Feb 22 14:23:38 2007
@@ -201,6 +201,7 @@
             put_be32(pb, codec->nsse_weight);
             put_be32(pb, codec->frame_skip_cmp);
             put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
+            put_be32(pb, codec->codec_tag);
             break;
         case CODEC_TYPE_AUDIO:
             put_be32(pb, codec->sample_rate);
@@ -534,6 +535,7 @@
             codec->nsse_weight = get_be32(pb);
             codec->frame_skip_cmp = get_be32(pb);
             codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
+            codec->codec_tag = get_be32(pb);
             break;
         case CODEC_TYPE_AUDIO:
             codec->sample_rate = get_be32(pb);