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 /libavutil | |
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 'libavutil')
0 files changed, 0 insertions, 0 deletions