[FFmpeg-cvslog] Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
Michael Niedermayer
git at videolan.org
Sat Apr 5 19:30:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 5 19:16:39 2014 +0200| [ebb21887b853ffd2ae6eedddef39e13c91bc7956] | committer: Michael Niedermayer
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebb21887b853ffd2ae6eedddef39e13c91bc7956
---
More information about the ffmpeg-cvslog
mailing list