[FFmpeg-cvslog] Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

Michael Niedermayer git at videolan.org
Sun Jun 16 22:46:33 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 22:40:43 2013 +0200| [46a5003a4a69b0e8cd824fd058618011d44bf8ef] | committer: Michael Niedermayer

Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_mp4toannexb_bsf.c

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

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





More information about the ffmpeg-cvslog mailing list