[FFmpeg-cvslog] Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'

Michael Niedermayer git at videolan.org
Sat Mar 21 16:07:35 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:57:21 2015 +0100| [c9841c05be67908e0980dafe0f7585ba47cbfe28] | committer: Michael Niedermayer

Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'

* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
  h264: move mvd_table into the per-slice context

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list