aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_mpdecimate.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-27 01:10:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-27 01:10:28 +0100
commit12ab07be447264b107b18bc49bb9e06be072330f (patch)
tree7efd220c82eba3dc7779839806ac5c1b080aa520 /libavfilter/vf_mpdecimate.c
parent61b5ef7754132c43e6db1a273066e82c469fa39c (diff)
parente50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b (diff)
downloadffmpeg-12ab07be447264b107b18bc49bb9e06be072330f.tar.gz
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mpdecimate.c')
0 files changed, 0 insertions, 0 deletions