Module: libav Branch: release/0.8 Commit: 62c35475396dd0c3afb5d6c66a1245c1a3bbe9b6
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Wed Jul 10 04:54:49 2013 +0200 pcm: always use codec->id instead of codec_id Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit c82da343e635663605bd81c59d872bee3182da73) Signed-off-by: Luca Barbato <[email protected]> Conflicts: libavcodec/pcm.c --- libavcodec/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 1adaf70..cd44d77 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -268,7 +268,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, /* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */ samples_per_block = 1; - if (CODEC_ID_PCM_DVD == avctx->codec_id) { + if (avctx->codec->id == CODEC_ID_PCM_DVD) { if (avctx->bits_per_coded_sample != 20 && avctx->bits_per_coded_sample != 24) { av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
