summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-10-29 21:24:19 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-10-29 21:24:52 (GMT)
commit6b312143793b34da3f54f5f5032af002c31bcc5a (patch)
tree97b7debc0d414b736f0c371d130a9480a8cbaf2c
parent845086149b157629e1e50f0ff4a0c722d9af095c (diff)
parent8fbb0979da8e42c65a1c5de1279165f6abb2b153 (diff)
downloadffmpeg-6b312143793b34da3f54f5f5032af002c31bcc5a.zip
ffmpeg-6b312143793b34da3f54f5f5032af002c31bcc5a.tar.gz
ffmpeg-6b312143793b34da3f54f5f5032af002c31bcc5a.tar.bz2
Merge remote-tracking branch 'qatar/master'
* qatar/master: build: remove pointless condition See: 94d707af3c8d2eb7dde7048929b056a451daabcb Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
0 files changed, 0 insertions, 0 deletions