[FFmpeg-cvslog] Merge commit 'c3d015775388882b8a122afc337ea35108f652be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 29 10:46:39 2013 +0100| [8ed9d34aa7f0002d46fa78bbda58a816edaf1169] | committer: Michael Niedermayer

Merge commit 'c3d015775388882b8a122afc337ea35108f652be'

* commit 'c3d015775388882b8a122afc337ea35108f652be':
  flvdec: use the correct audio codec id when parsing metadata

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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