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/smacker.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
| download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/smacker.c')
| -rw-r--r-- | libavformat/smacker.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 0b790b82ae..362a7e6c12 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -163,7 +163,7 @@ static int smacker_read_header(AVFormatContext *s) st->codec->height = smk->height; st->codec->pix_fmt = PIX_FMT_PAL8; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_SMACKVIDEO; + st->codec->codec_id = AV_CODEC_ID_SMACKVIDEO; st->codec->codec_tag = smk->magic; /* Smacker uses 100000 as internal timebase */ if(smk->pts_inc < 0) @@ -182,20 +182,20 @@ static int smacker_read_header(AVFormatContext *s) smk->indexes[i] = ast[i]->index; ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO; if (smk->aflags[i] & SMK_AUD_BINKAUD) { - ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_RDFT; + ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT; } else if (smk->aflags[i] & SMK_AUD_USEDCT) { - ast[i]->codec->codec_id = CODEC_ID_BINKAUDIO_DCT; + ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; } else if (smk->aflags[i] & SMK_AUD_PACKED){ - ast[i]->codec->codec_id = CODEC_ID_SMACKAUDIO; + ast[i]->codec->codec_id = AV_CODEC_ID_SMACKAUDIO; ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A'); } else { - ast[i]->codec->codec_id = CODEC_ID_PCM_U8; + ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8; } ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1; ast[i]->codec->sample_rate = smk->rates[i]; ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8; - if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) - ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; + if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8) + ast[i]->codec->codec_id = AV_CODEC_ID_PCM_S16LE; avpriv_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate * ast[i]->codec->channels * ast[i]->codec->bits_per_coded_sample / 8); } |