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/rpl.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
| download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/rpl.c')
| -rw-r--r-- | libavformat/rpl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 07d6895ee2..a5b1e6ec69 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -156,24 +156,24 @@ static int rpl_read_header(AVFormatContext *s) switch (vst->codec->codec_tag) { #if 0 case 122: - vst->codec->codec_id = CODEC_ID_ESCAPE122; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE122; break; #endif case 124: - vst->codec->codec_id = CODEC_ID_ESCAPE124; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE124; // The header is wrong here, at least sometimes vst->codec->bits_per_coded_sample = 16; break; #if 0 case 130: - vst->codec->codec_id = CODEC_ID_ESCAPE130; + vst->codec->codec_id = AV_CODEC_ID_ESCAPE130; break; #endif default: av_log(s, AV_LOG_WARNING, "RPL video format %i not supported yet!\n", vst->codec->codec_tag); - vst->codec->codec_id = CODEC_ID_NONE; + vst->codec->codec_id = AV_CODEC_ID_NONE; } // Audio headers @@ -199,12 +199,12 @@ static int rpl_read_header(AVFormatContext *s) ast->codec->bits_per_coded_sample * ast->codec->channels; - ast->codec->codec_id = CODEC_ID_NONE; + ast->codec->codec_id = AV_CODEC_ID_NONE; switch (audio_format) { case 1: if (ast->codec->bits_per_coded_sample == 16) { // 16-bit audio is always signed - ast->codec->codec_id = CODEC_ID_PCM_S16LE; + ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break; } // There are some other formats listed as legal per the spec; @@ -214,15 +214,15 @@ static int rpl_read_header(AVFormatContext *s) if (ast->codec->bits_per_coded_sample == 8) { // The samples with this kind of audio that I have // are all unsigned. - ast->codec->codec_id = CODEC_ID_PCM_U8; + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; break; } else if (ast->codec->bits_per_coded_sample == 4) { - ast->codec->codec_id = CODEC_ID_ADPCM_IMA_EA_SEAD; + ast->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_EA_SEAD; break; } break; } - if (ast->codec->codec_id == CODEC_ID_NONE) { + if (ast->codec->codec_id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_WARNING, "RPL audio format %i not supported yet!\n", audio_format); |