[FFmpeg-cvslog] avformat/isom: remove duplicated line

Michael Niedermayer git at videolan.org
Sun Mar 9 22:15:02 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:12:37 2014 +0100| [6783b3eb761b119c606b6b79937fc9aefda775ce] | committer: Michael Niedermayer

avformat/isom: remove duplicated line

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6783b3eb761b119c606b6b79937fc9aefda775ce
---

 libavformat/isom.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 4bdbfbb..ba952b8 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -167,7 +167,6 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
-    { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */
     { AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */
 



More information about the ffmpeg-cvslog mailing list