diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 22:45:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 22:45:46 +0200 |
| commit | 7a72695c05f12f21a62dc99fa64d1726fc11b236 (patch) | |
| tree | e8f1a2813c4cd1fd8bd0ac5f764c7fd676ab85af /libavformat/bintext.c | |
| parent | 49440853d0c1e740daee0e2df1e65d5e67b1ad6b (diff) | |
| parent | 36ef5369ee9b336febc2c270f8718cec4476cb85 (diff) | |
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bintext.c')
| -rw-r--r-- | libavformat/bintext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/bintext.c b/libavformat/bintext.c index 58db3cf71a..5ad30b3519 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -148,7 +148,7 @@ static int bintext_read_header(AVFormatContext *s) AVStream *st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_BINTEXT; + st->codec->codec_id = AV_CODEC_ID_BINTEXT; st->codec->extradata_size = 2; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -206,7 +206,7 @@ static int xbin_read_header(AVFormatContext *s) st->codec->extradata_size += 48; if ((flags & BINTEXT_FONT)) st->codec->extradata_size += fontheight * (flags & 0x10 ? 512 : 256); - st->codec->codec_id = flags & 4 ? CODEC_ID_XBIN : CODEC_ID_BINTEXT; + st->codec->codec_id = flags & 4 ? AV_CODEC_ID_XBIN : AV_CODEC_ID_BINTEXT; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) @@ -239,7 +239,7 @@ static int adf_read_header(AVFormatContext *s) st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_BINTEXT; + st->codec->codec_id = AV_CODEC_ID_BINTEXT; st->codec->extradata_size = 2 + 48 + 4096; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); @@ -296,7 +296,7 @@ static int idf_read_header(AVFormatContext *s) st = init_stream(s); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_IDF; + st->codec->codec_id = AV_CODEC_ID_IDF; st->codec->extradata_size = 2 + 48 + 4096; st->codec->extradata = av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |