[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sat Jan 4 03:21:27 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 4 03:13:54 2014 +0100| [adc09a353c5ff467fdc924373e2ee1faf703b3b3] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adc09a353c5ff467fdc924373e2ee1faf703b3b3
---
More information about the ffmpeg-cvslog
mailing list