ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jul 21
13:33:51 2014 +0200| [d986c414dea14cef41d83f74b9549202c2efe6be] | committer:
Michael Niedermayer
Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'
* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce':
dct-test: Move arch-specific bits into arch-specific subdirectories
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d986c414dea14cef41d83f74b9549202c2efe6be
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
