[FFmpeg-cvslog] Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'

Michael Niedermayer git at videolan.org
Sat Mar 21 20:23:19 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 20:10:49 2015 +0100| [84ae7294cbaa413b80d632f79d539270dd4bd6b5] | committer: Michael Niedermayer

Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'

* commit '3178f4d33ff62243f7cdddb081db516ea34396c9':
  h264: move rbsp_buffer into the per-slice context

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list