Merge commit '0097cbea695e534fce39958ccd103af2fbf65831'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:02:25 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:12:04 +0000 (14:12 +0200)
commit855e3b5700fff78bf20f900daade58396b73846d
treebb9cb11b8c16cd37154c10f3b500ab3618627bfa
parent05c5dd403d6a6974eb0a0688fcd22fe0417c2d84
parent0097cbea695e534fce39958ccd103af2fbf65831
Merge commit '0097cbea695e534fce39958ccd103af2fbf65831'

* commit '0097cbea695e534fce39958ccd103af2fbf65831':
  flac muxer: accept only STREAMINFO extradata

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