[FFmpeg-cvslog] Merge commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:33:45 2013 +0100| [8d691f87776900ec7c4addbed7df87405b16d6df] | committer: Michael Niedermayer

Merge commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f'

* commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f':
  idcin: fix check for presence of an audio stream
  idcin: validate header parameters

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

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