aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_pixdesctest.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-07 02:35:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-07 02:35:39 +0200
commit71f33051e5d012ccf24d447ba7c01a867f8e77c1 (patch)
tree25b96b42c0a4aa63d2530750673ea471e683f227 /libavfilter/vf_pixdesctest.c
parent4213fc5b9eebec53c7d22b770c3f1ceecca1c113 (diff)
parentd9432789bd119f0e37bcf65cebda05d36aafd4ed (diff)
downloadffmpeg-71f33051e5d012ccf24d447ba7c01a867f8e77c1.tar.gz
Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed': movenc: remove pointless loop around BITEXACT test Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
0 files changed, 0 insertions, 0 deletions