aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/generate_wave_table.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-06 11:00:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-06 11:06:19 +0100
commit5f7887ca8d056d2debdd2c3b205ada7305d9ac07 (patch)
treeceee289debe80e040b5d329484408495d488913f /libavfilter/generate_wave_table.c
parenta0617025dd264ba1db6a3dccfaed942ba0dd2bbe (diff)
parent6896f95b2483e52e717e2c75a4fd24fcb0e14b67 (diff)
downloadffmpeg-5f7887ca8d056d2debdd2c3b205ada7305d9ac07.tar.gz
Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'
* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67': vorbis_parser: add an AV prefix to VorbisParseContext Conflicts: libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/generate_wave_table.c')
0 files changed, 0 insertions, 0 deletions