aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/snowdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-10 02:53:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-10 03:00:48 +0100
commit402a411406854d20b3f3ab105185ccff7f6cd9ff (patch)
tree0aa0b313eb532f5276e6048ea331b6df8e909493 /libavcodec/snowdec.c
parent3b8299c1e1c72fdd4284d88e7d426bd35689acd3 (diff)
parenta7d0e7ead95e584c4866617f046b2493066975c6 (diff)
downloadffmpeg-402a411406854d20b3f3ab105185ccff7f6cd9ff.tar.gz
Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6': lavfi: add framepack filter Conflicts: Changelog doc/filters.texi libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snowdec.c')
0 files changed, 0 insertions, 0 deletions