[FFmpeg-cvslog] Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

Michael Niedermayer git at videolan.org
Fri Dec 14 15:21:33 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:00:28 2012 +0100| [b9d887c225466576ae80ef7f2b109e866ff137b2] | committer: Michael Niedermayer

Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list