Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:33:07 +0000 (12:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:33:49 +0000 (12:33 +0200)
commit40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed
treeca643d04291fcbfc5e857007a86a03463462f836
parent61301ca7860fb044995c71a0cd432cb3d833eb3b
parent5fdaf312c5541b77b6364db8b49d6abb416a25c0
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'

* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flac.c
libavcodec/flac.h
libavcodec/flacdec.c
libavformat/flacdec.c