diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-10 04:54:49 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-21 15:15:34 +0200 |
| commit | 62c35475396dd0c3afb5d6c66a1245c1a3bbe9b6 (patch) | |
| tree | 85baf8aaa522e9264d55ed5c98df56c5e46033e4 | |
| parent | 47baf9ca87347a8f7516a45f446c7756ad6cb89d (diff) | |
| download | ffmpeg-62c35475396dd0c3afb5d6c66a1245c1a3bbe9b6.tar.gz | |
pcm: always use codec->id instead of codec_id
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit c82da343e635663605bd81c59d872bee3182da73)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/pcm.c
| -rw-r--r-- | libavcodec/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 1adaf70318..cd44d77000 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"); |