Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 08:50:24 +0000 (10:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 08:50:24 +0000 (10:50 +0200)
commite2d4bcd7b8447eaf9628e893eb482f22ae825237
tree9ea5f55760468e3ea7c026ece31a60622b97ffa4
parent56abad0ee4a34789f8bc00ba236c7f6be982ce26
parentf8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1
Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_parser.c
libavcodec/vorbisdec.c