[FFmpeg-cvslog] avisynth: Use AV_* prefixes for video and audio IDs
Stephen Hutchinson
git at videolan.org
Mon Oct 28 22:38:05 CET 2013
ffmpeg | branch: master | Stephen Hutchinson <qyot27 at gmail.com> | Mon Oct 28 16:52:50 2013 -0400| [c7f9aab8014206d6ffb4c86d6e1f25fe7171ab39] | committer: Michael Niedermayer
avisynth: Use AV_* prefixes for video and audio IDs
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7f9aab8014206d6ffb4c86d6e1f25fe7171ab39
---
libavformat/avisynth.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index f217c19..f34117c 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -221,7 +221,7 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
int planar = 0; // 0: packed, 1: YUV, 2: Y8
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = CODEC_ID_RAWVIDEO;
+ st->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
st->codec->width = avs->vi->width;
st->codec->height = avs->vi->height;
@@ -304,19 +304,19 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
switch (avs->vi->sample_type) {
case AVS_SAMPLE_INT8:
- st->codec->codec_id = CODEC_ID_PCM_U8;
+ st->codec->codec_id = AV_CODEC_ID_PCM_U8;
break;
case AVS_SAMPLE_INT16:
- st->codec->codec_id = CODEC_ID_PCM_S16LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
break;
case AVS_SAMPLE_INT24:
- st->codec->codec_id = CODEC_ID_PCM_S24LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S24LE;
break;
case AVS_SAMPLE_INT32:
- st->codec->codec_id = CODEC_ID_PCM_S32LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S32LE;
break;
case AVS_SAMPLE_FLOAT:
- st->codec->codec_id = CODEC_ID_PCM_F32LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_F32LE;
break;
default:
av_log(s, AV_LOG_ERROR,
More information about the ffmpeg-cvslog
mailing list