]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74b2b0e 6cc133e)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:36:36 +0000 (14:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:36:58 +0000 (14:36 +0200)
* qatar/master:
  x86: fdct: Only build fdct code if encoders have been enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/Makefile patch | diff1 | diff2 | blob | history

diff --cc libavcodec/x86/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.