aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/synth_filter.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 00:35:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 00:35:39 +0200
commit348319f5438fa2117cf19c42317a7d7875876981 (patch)
treeb2e7d935b82a6f4430fbe68f5cb8f61b7adb1057 /libavcodec/synth_filter.h
parentc2876c0181d170ed9d4d962599f5b65ba4e85178 (diff)
parenta8a90906fb0ad0f8d3c68a97f182528ee3b5198c (diff)
downloadffmpeg-348319f5438fa2117cf19c42317a7d7875876981.tar.gz
Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'
* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c': mov: Correctly allocate ctts_data Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/synth_filter.h')
0 files changed, 0 insertions, 0 deletions