From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 12 Jul 2013 11:48:16 +0000 (+0200)
Subject: Merge commit 'c82da343e635663605bd81c59d872bee3182da73'
X-Git-Tag: android-x86-4.4-r1~2388
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=73f940e4d94c8f7bc8713af6e092d1d580de81fd;p=android-x86%2Fexternal-ffmpeg.git

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>
---

73f940e4d94c8f7bc8713af6e092d1d580de81fd
diff --cc libavcodec/pcm.c
index d5f7ea72de,31ee283daf..2f256dec98
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@@ -298,12 -265,10 +298,12 @@@ static int pcm_decode_frame(AVCodecCont
  
      /* 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->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");
 +            av_log(avctx, AV_LOG_ERROR,
 +                   "PCM DVD unsupported sample depth %i\n",
 +                   avctx->bits_per_coded_sample);
              return AVERROR(EINVAL);
          }
          /* 2 samples are interleaved per block in PCM_DVD */