diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
| commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
| tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavformat/nuv.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/nuv.c')
| -rw-r--r-- | libavformat/nuv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 0cf5f72100..fce96b420c 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -90,7 +90,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, vst->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag); if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G')) - vst->codec->codec_id = CODEC_ID_NUV; + vst->codec->codec_id = AV_CODEC_ID_NUV; } else avio_skip(pb, 4); @@ -158,7 +158,7 @@ static int nuv_header(AVFormatContext *s) { if (!vst) return AVERROR(ENOMEM); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_NUV; + vst->codec->codec_id = AV_CODEC_ID_NUV; vst->codec->width = width; vst->codec->height = height; vst->codec->bits_per_coded_sample = 10; @@ -177,7 +177,7 @@ static int nuv_header(AVFormatContext *s) { if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_id = CODEC_ID_PCM_S16LE; + ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE; ast->codec->channels = 2; ast->codec->sample_rate = 44100; ast->codec->bit_rate = 2 * 2 * 44100 * 8; @@ -188,7 +188,7 @@ static int nuv_header(AVFormatContext *s) { ctx->a_id = -1; get_codec_data(pb, vst, ast, is_mythtv); - ctx->rtjpg_video = vst && vst->codec->codec_id == CODEC_ID_NUV; + ctx->rtjpg_video = vst && vst->codec->codec_id == AV_CODEC_ID_NUV; return 0; } |