projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0d973c
)
pcm: always use codec->id instead of codec_id
author
Luca Barbato
<lu_zero@gentoo.org>
Wed, 10 Jul 2013 02:54:49 +0000
(
04:54
+0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Fri, 12 Jul 2013 02:34:49 +0000
(
04:34
+0200)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
libavcodec/pcm.c
patch
|
blob
|
history
diff --git
a/libavcodec/pcm.c
b/libavcodec/pcm.c
index
c56a95e
..
31ee283
100644
(file)
--- a/
libavcodec/pcm.c
+++ b/
libavcodec/pcm.c
@@
-265,7
+265,7
@@
static int pcm_decode_frame(AVCodecContext *avctx, void *data,
/* av_get_bits_per_sample returns 0 for AV_CODEC_ID_PCM_DVD */
samples_per_block = 1;
- if (
AV_CODEC_ID_PCM_DVD == avctx->codec_id
) {
+ if (
avctx->codec->id == AV_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");