[FFmpeg-cvslog] Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'
Michael Niedermayer
git at videolan.org
Fri Jun 27 02:11:46 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 01:31:42 2014 +0200| [357168bcf63429e9472fb9fff1e1301f9514dca6] | committer: Michael Niedermayer
Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
indeo4: B-frames decoding
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=357168bcf63429e9472fb9fff1e1301f9514dca6
---
More information about the ffmpeg-cvslog
mailing list