ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jul 18
21:36:46 2014 +0200| [29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b] | committer:
Michael Niedermayer
Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
dct-test: Improve CPU flags struct member name
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
