[FFmpeg-cvslog] Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'

Michael Niedermayer git at videolan.org
Sat Mar 21 16:53:50 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 16:18:29 2015 +0100| [668c65e7e73a21c86f43ffa1f79bf023fa44cbcd] | committer: Michael Niedermayer

Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'

* commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522':
  h264: move mb_xy into the per-slice context

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cabac.c
	libavcodec/svq3.c

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

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





More information about the ffmpeg-cvslog mailing list