[FFmpeg-cvslog] Merge commit '68f930d2188aba5b32624887dcbf688c23482834'

Michael Niedermayer git at videolan.org
Sat Feb 16 14:20:31 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 14:13:20 2013 +0100| [131b9c924d6df2b52ca5821a13ddf6fdb49fe76c] | committer: Michael Niedermayer

Merge commit '68f930d2188aba5b32624887dcbf688c23482834'

* commit '68f930d2188aba5b32624887dcbf688c23482834':
  h264: simplify calls to ff_er_add_slice().

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list