ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Jul 13
21:37:47 2014 +0200| [cc3e7a4c3df9f6de6f4a2f312355dc221d6380f0] | committer:
Michael Niedermayer
Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'
* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc3e7a4c3df9f6de6f4a2f312355dc221d6380f0
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
