[FFmpeg-cvslog] Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'

Michael Niedermayer git at videolan.org
Sat Mar 21 15:25:36 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 14:59:58 2015 +0100| [cc2cfdc49786a8268d1514661c17ea96035d6f1d] | committer: Michael Niedermayer

Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'

* commit '95eb35f30513e335990ad0d5dca6ddc318477291':
  h264: move the ref lists variables into the per-slice context

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_mb.c
	libavcodec/h264_picture.c
	libavcodec/h264_refs.c
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list