[FFmpeg-cvslog] Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
Michael Niedermayer
git at videolan.org
Tue Jul 8 15:45:36 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 8 14:44:12 2014 +0200| [1f935c3d0b8ca8659974afc02ebdf058dd99cd9c] | committer: Michael Niedermayer
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
arm: Avoid using the 'setend' instruction on ARMv7 and newer
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f935c3d0b8ca8659974afc02ebdf058dd99cd9c
---
More information about the ffmpeg-cvslog
mailing list