Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 19:27:09 +0000 (21:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 19:27:09 +0000 (21:27 +0200)
commit277ae5a7b30496eabfb35b4dd6a62a335a422085
tree8b103f7a61bed8a88062ad9bac50943ca85a1090
parent31f2357fd0e273365b1ae667e191638937e188e3
parent374fdc8c071dcd96422378b0a1a0d453336d8a01
Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'

* commit '374fdc8c071dcd96422378b0a1a0d453336d8a01':
  flv: Improve log messages

Conflicts:
libavformat/flvdec.c

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