[SCM] libav/experimental: Use CODEC_ID_NONE instead of 0 for enum CodecID.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:54:13 UTC 2013
The following commit has been merged in the experimental branch:
commit 80454494dea444a4de8950fb1f8f76c30a9f34b2
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date: Sun Nov 8 23:46:32 2009 +0000
Use CODEC_ID_NONE instead of 0 for enum CodecID.
Originally committed as revision 20481 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index 5f86a37..e8d4cce 100644
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
{ CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') },
{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
{ CODEC_ID_QDM2, MKTAG('Q','D','M','2') },
- { 0, 0 },
+ { CODEC_ID_NONE, 0 },
};
#endif /* AVFORMAT_AIFF_H */
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 8175a9b..12dedcc 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -86,7 +86,7 @@ static const struct {
{ CODEC_ID_MPEG2VIDEO, 0 },
{ CODEC_ID_PCM_S24LE, 1 },
{ CODEC_ID_PCM_S16LE, 1 },
- { 0 }
+ { CODEC_ID_NONE }
};
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list