[FFmpeg-cvslog] Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'

Michael Niedermayer git at videolan.org
Sat Mar 21 13:34:50 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:24:23 2015 +0100| [c27f53b9fbcd8f638afecc637ef844b612cc39be] | committer: Michael Niedermayer

Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'

* commit 'd231e84b06a9964c840cff4e228509f706165fb6':
  h264: move the quantizers into the per-slice context

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c

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

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





More information about the ffmpeg-cvslog mailing list