[SCM] libav/experimental: 10l

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b49d4175c26ae5b3dd0a532f9653752b21375410
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Sep 29 22:40:01 2003 +0000

    10l
    
    Originally committed as revision 2321 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index ce31b21..ba2785f 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -113,9 +113,6 @@ const CodecTag codec_bmp_tags[] = {
  
     { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, 
 
-    /* added based on MPlayer */
-    { CODEC_ID_MSMPEG4V1, MKTAG('D', 'I', 'V', '4') }, 
-
     { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, 
 
     /* added based on MPlayer */

-- 
Libav/FFmpeg packaging