[FFmpeg-cvslog] Merge commit '75644335b907919057960716508477239c26fed4'

Michael Niedermayer git at videolan.org
Tue Mar 26 13:28:12 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 26 13:22:48 2013 +0100| [2cdedcbceab952297d5ee0f433b5a5c7482e48d6] | committer: Michael Niedermayer

Merge commit '75644335b907919057960716508477239c26fed4'

* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
	configure
	libavcodec/mpegvideo.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cdedcbceab952297d5ee0f433b5a5c7482e48d6
---





More information about the ffmpeg-cvslog mailing list