[FFmpeg-cvslog] Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 02:16:04 2014 +0200| [57e7d9d929783a7bf5728cecabcf4bea53473919] | committer: Michael Niedermayer

Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const

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

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