[Ffmpeg-cvslog] CVS: ffmpeg/libavformat smacker.c,1.2,1.3

[Konstantin Shishkov CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv4779/libavformat

Modified Files:
	smacker.c 
Log Message:
Now MPlayer should understand Smacker audio and video codecs.


Index: smacker.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/smacker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smacker.c	13 May 2006 11:37:56 -0000	1.2
+++ smacker.c	17 May 2006 03:03:53 -0000	1.3
@@ -156,7 +156,7 @@
     st->codec->pix_fmt = PIX_FMT_PAL8;
     st->codec->codec_type = CODEC_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_SMACKVIDEO;
-    st->codec->codec_tag = smk->is_ver4;
+    st->codec->codec_tag = smk->magic;
     /* Smacker uses 100000 as internal timebase */
     if(smk->pts_inc < 0)
         smk->pts_inc = -smk->pts_inc;
@@ -174,7 +174,7 @@
             av_set_pts_info(ast[i], 33, smk->pts_inc, tbase);
             ast[i]->codec->codec_type = CODEC_TYPE_AUDIO;
             ast[i]->codec->codec_id = (smk->rates[i] & SMK_AUD_PACKED) ? CODEC_ID_SMACKAUDIO : CODEC_ID_PCM_U8;
-            ast[i]->codec->codec_tag = 0;
+            ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A');
             ast[i]->codec->channels = (smk->rates[i] & SMK_AUD_STEREO) ? 2 : 1;
             ast[i]->codec->sample_rate = smk->rates[i] & 0xFFFFFF;
             ast[i]->codec->bits_per_sample = (smk->rates[i] & SMK_AUD_16BITS) ? 16 : 8;