aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 18:30:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 18:30:47 +0200
commit0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1 (patch)
tree5602f50fe193e3307a6ae8320fc478533ebe3a06 /libavfilter
parent508a5349da9869382803445f8e380751ec43021e (diff)
parent255d9c570e117f0fcb8e51fa2c5996f3c4b2052b (diff)
downloadffmpeg-0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1.tar.gz
Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b': riff: Move demuxing code to a separate file. Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions