Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:16:04 +0000 (02:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:16:09 +0000 (02:16 +0200)
commit57e7d9d929783a7bf5728cecabcf4bea53473919
tree0017d0413fa0e3a546134fb922d03449b93b45c3
parent6542e5575f1425ecc9972a1bb7477d03816e40d0
parent7215fcf84032118ecd9fb54fb14154d69fea638d
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h
libavformat/utils.c