[FFmpeg-devel] [PATCH] lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

[Ronald S. Bultje]

Hi,

On Wed, Feb 23, 2011 at 12:02 PM, Ronald S. Bultje <rsbultje at gmail.com> wrote:
> Hi,
>
> On Wed, Feb 23, 2011 at 11:54 AM, Anton Khirnov <anton at khirnov.net> wrote:
>> ---
>> ?libavformat/aiffenc.c ? ? ? | ? 11 +-
>> ?libavformat/au.c ? ? ? ? ? ?| ? ?3 +-
>> ?libavformat/avienc.c ? ? ? ?| ? 39 ++++----
>> ?libavformat/avio_internal.h | ? ?2 +
>> ?libavformat/flvenc.c ? ? ? ?| ? ?3 +-
>> ?libavformat/img2.c ? ? ? ? ?| ? ?9 +-
>> ?libavformat/mmf.c ? ? ? ? ? | ? ?5 +-
>> ?libavformat/movenc.c ? ? ? ?| ?215 ++++++++++++++++++++++---------------------
>> ?libavformat/oggenc.c ? ? ? ?| ? ?3 +-
>> ?libavformat/riff.c ? ? ? ? ?| ? ?3 +-
>> ?libavformat/rmenc.c ? ? ? ? | ? 18 ++--
>> ?libavformat/soxenc.c ? ? ? ?| ? ?5 +-
>> ?libavformat/wav.c ? ? ? ? ? | ? ?5 +-
>> ?13 files changed, 168 insertions(+), 153 deletions(-)
>
> Anton said he'd do &tag[0] -> tag separately, so fine with me, queued.

Unqueued, breaks fate:

@@ -199,7 +200,7 @@ static int flv_write_header(AVFormatContext *s)
         }
         av_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */
     }
-    put_tag(pb,"FLV");
+    ffio_wfourcc(pb, "FLV");

TEST    acodec-adpcm_swf
--- /Users/ronaldbultje/Projects/ffmpeg-git/tests/ref/acodec/adpcm_swf	2011-01-19
12:12:43.000000000 -0500
+++ tests/data/regression/acodec/adpcm_swf	2011-02-23 12:02:25.000000000 -0500
@@ -1,4 +1,2 @@
-42d4639866ed4d692eaf126228a4fa2a *./tests/data/acodec/adpcm_swf.flv
-269166 ./tests/data/acodec/adpcm_swf.flv
-628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.acodec.out.wav
-stddev:  933.58 PSNR: 36.93 MAXDIFF:51119 bytes:  1064960/  1058400
+66ce0bc3a2b056a7b02f1ee04b9d95d3 *./tests/data/acodec/adpcm_swf.flv
+  269167 ./tests/data/acodec/adpcm_swf.flv
make: *** [fate-acodec-adpcm_swf] Error 1

Ronald