[SCM] libav/experimental: 4xm codec tag

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:39:55 UTC 2013


The following commit has been merged in the experimental branch:
commit 7585aa5c4e42fe74b76fd75fdcd38a7cea0764a1
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Apr 11 19:18:53 2004 +0000

    4xm codec tag
    
    Originally committed as revision 3001 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 831d6c3..071ed5c 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -158,6 +158,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') },
     { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
     { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
+    { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
     { 0, 0 },
 };
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list