[SCM] libav/experimental: matroskadec: remove useless comments in ff_mkv_codec_tags
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:26:54 UTC 2013
The following commit has been merged in the experimental branch:
commit 20fb02c5b93625764990f89fbea1a3793965e00c
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Tue Aug 5 00:42:46 2008 +0000
matroskadec: remove useless comments in ff_mkv_codec_tags
Originally committed as revision 14606 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index da42b56..01e9dec 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -22,7 +22,6 @@
#include "matroska.h"
const CodecTags ff_mkv_codec_tags[]={
-// {"V_MS/VFW/FOURCC" , CODEC_ID_NONE},
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
{"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
@@ -38,9 +37,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_REAL/RV40" , CODEC_ID_RV40},
{"V_THEORA" , CODEC_ID_THEORA},
{"V_SNOW" , CODEC_ID_SNOW},
-/* TODO: Real/Quicktime */
-// {"A_MS/ACM" , CODEC_ID_NONE},
{"A_MPEG/L3" , CODEC_ID_MP3},
{"A_MPEG/L2" , CODEC_ID_MP2},
{"A_MPEG/L1" , CODEC_ID_MP2},
@@ -48,6 +45,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE},
// {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
{"A_AC3" , CODEC_ID_AC3},
+// {"A_EAC3" , CODEC_ID_EAC3},
{"A_DTS" , CODEC_ID_DTS},
{"A_VORBIS" , CODEC_ID_VORBIS},
{"A_AAC" , CODEC_ID_AAC},
@@ -70,7 +68,6 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
{"" , CODEC_ID_NONE}
-/* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
};
const CodecMime ff_mkv_mime_tags[] = {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list