[FFmpeg-cvslog] Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'

Michael Niedermayer git at videolan.org
Wed Apr 29 11:55:51 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 11:48:39 2015 +0200| [cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4] | committer: Michael Niedermayer

Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'

* commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7':
  h264: move the DPB init/uninit to init_context()/free_context()

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list