[FFmpeg-cvslog] Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'

Michael Niedermayer git at videolan.org
Mon Mar 24 00:58:42 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 00:46:20 2014 +0100| [0626211b561f299971a96b7bd1ee6f8a6d6735c8] | committer: Michael Niedermayer

Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'

* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
  h264: move macroblock decoding into its own file

Conflicts:
	libavcodec/Makefile
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list