virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

mpc7: convert to new channel layout API

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov 2013-05-07 07:20:32 +02:00 committed by James Almer
parent d4b79b2e32
commit edd7be9383
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpc7.c
View File

@ -79,8 +79,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
LOCAL_ALIGNED_16(uint8_t, buf, [16]); LOCAL_ALIGNED_16(uint8_t, buf, [16]);
/* Musepack SV7 is always stereo */ /* Musepack SV7 is always stereo */
if (avctx->channels != 2) { if (avctx->ch_layout.nb_channels != 2) {
avpriv_request_sample(avctx, "%d channels", avctx->channels); avpriv_request_sample(avctx, "%d channels", avctx->ch_layout.nb_channels);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
@ -110,7 +110,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
c->frames_to_skip = 0; c->frames_to_skip = 0;
avctx->sample_fmt = AV_SAMPLE_FMT_S16P; avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; av_channel_layout_uninit(&avctx->ch_layout);
avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
ff_thread_once(&init_static_once, mpc7_init_static); ff_thread_once(&init_static_once, mpc7_init_static);