summaryrefslogtreecommitdiff
authorStephen Hutchinson <qyot27@gmail.com>2013-10-28 20:52:50 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-10-28 21:26:56 (GMT)
commitc7f9aab8014206d6ffb4c86d6e1f25fe7171ab39 (patch)
tree1551bbdc9a4ce3524512caf527459c5188c2c120
parentcf31c1d4f835356ba1c21ecf22bd697e18c6d6c3 (diff)
downloadffmpeg-c7f9aab8014206d6ffb4c86d6e1f25fe7171ab39.zip
ffmpeg-c7f9aab8014206d6ffb4c86d6e1f25fe7171ab39.tar.gz
ffmpeg-c7f9aab8014206d6ffb4c86d6e1f25fe7171ab39.tar.bz2
avisynth: Use AV_* prefixes for video and audio IDs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libavformat/avisynth.c12
1 files 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,