diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:48:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 14:08:32 +0200 |
| commit | 73f940e4d94c8f7bc8713af6e092d1d580de81fd (patch) | |
| tree | 5fea634ac98242d91615499d8d4f00393642540a /libavcodec/pcm.c | |
| parent | 0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb (diff) | |
| parent | c82da343e635663605bd81c59d872bee3182da73 (diff) | |
| download | ffmpeg-73f940e4d94c8f7bc8713af6e092d1d580de81fd.tar.gz | |
Merge commit 'c82da343e635663605bd81c59d872bee3182da73'
* commit 'c82da343e635663605bd81c59d872bee3182da73':
pcm: always use codec->id instead of codec_id
This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '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 d5f7ea72de..2f256dec98 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -298,7 +298,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, |