ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jul 22
12:46:13 2014 +0200| [7cdb3b2b79d78b7b3e686b3a53e904b4656d461f] | committer:
Michael Niedermayer
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
arm: Macroize the test for 'setend' CPU instruction support
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cdb3b2b79d78b7b3e686b3a53e904b4656d461f
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
