summaryrefslogtreecommitdiffstats
path: root/ffmpeg_filter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-01 14:02:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-01 14:12:04 +0200
commit855e3b5700fff78bf20f900daade58396b73846d (patch)
treebb9cb11b8c16cd37154c10f3b500ab3618627bfa /ffmpeg_filter.c
parent05c5dd403d6a6974eb0a0688fcd22fe0417c2d84 (diff)
parent0097cbea695e534fce39958ccd103af2fbf65831 (diff)
downloadffmpeg-streaming-855e3b5700fff78bf20f900daade58396b73846d.zip
ffmpeg-streaming-855e3b5700fff78bf20f900daade58396b73846d.tar.gz
Merge commit '0097cbea695e534fce39958ccd103af2fbf65831'
* commit '0097cbea695e534fce39958ccd103af2fbf65831': flac muxer: accept only STREAMINFO extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud