[FFmpeg-cvslog] Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

Michael Niedermayer git at videolan.org
Thu Mar 21 12:16:15 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 12:05:13 2013 +0100| [bbc0f6f9789361f9ddd462bc458410e6f0081d57] | committer: Michael Niedermayer

Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

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

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





More information about the ffmpeg-cvslog mailing list