[FFmpeg-cvslog] Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'

Michael Niedermayer git at videolan.org
Sun May 11 21:57:45 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 21:48:32 2014 +0200| [d93cf093f840b9a28481c73d7e421f469f2ca4e7] | committer: Michael Niedermayer

Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'

* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
  lavc: Add an internal wrapper around get_format()

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/mpeg12dec.c

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

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





More information about the ffmpeg-cvslog mailing list