[FFmpeg-cvslog] Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'

Michael Niedermayer git at videolan.org
Thu Apr 11 12:04:43 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 12:00:05 2013 +0200| [65120f628ca5facb8ae5e14d923ed31218bc9409] | committer: Michael Niedermayer

Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'

* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
  h264: Only initialize dsputil if error resilience is enabled

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list