[FFmpeg-cvslog] Merge commit 'c82da343e635663605bd81c59d872bee3182da73'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 13:48:16 2013 +0200| [73f940e4d94c8f7bc8713af6e092d1d580de81fd] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73f940e4d94c8f7bc8713af6e092d1d580de81fd
---