OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0da0caa c82da34)
Merge commit 'c82da343e635663605bd81c59d872bee3182da73'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:48:16 +0000 (13:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:08:32 +0000 (14:08 +0200)
commit73f940e4d94c8f7bc8713af6e092d1d580de81fd
tree5fea634ac98242d91615499d8d4f00393642540atree | snapshot
parent0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fbcommit | diff
parentc82da343e635663605bd81c59d872bee3182da73commit | diff
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>
libavcodec/pcm.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help