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 /libavcodec/vp6.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 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 6c88d02bc0..34361e88e5 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -594,8 +594,8 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) { VP56Context *s = avctx->priv_data; - ff_vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, - avctx->codec->id == CODEC_ID_VP6A); + ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6, + avctx->codec->id == AV_CODEC_ID_VP6A); s->vp56_coord_div = vp6_coord_div; s->parse_vector_adjustment = vp6_parse_vector_adjustment; s->filter = vp6_filter; @@ -627,7 +627,7 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx) AVCodec ff_vp6_decoder = { .name = "vp6", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VP6, + .id = AV_CODEC_ID_VP6, .priv_data_size = sizeof(VP56Context), .init = vp6_decode_init, .close = vp6_decode_free, @@ -640,7 +640,7 @@ AVCodec ff_vp6_decoder = { AVCodec ff_vp6f_decoder = { .name = "vp6f", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VP6F, + .id = AV_CODEC_ID_VP6F, .priv_data_size = sizeof(VP56Context), .init = vp6_decode_init, .close = vp6_decode_free, @@ -653,7 +653,7 @@ AVCodec ff_vp6f_decoder = { AVCodec ff_vp6a_decoder = { .name = "vp6a", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VP6A, + .id = AV_CODEC_ID_VP6A, .priv_data_size = sizeof(VP56Context), .init = vp6_decode_init, .close = vp6_decode_free, |