[FFmpeg-cvslog] Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'

Michael Niedermayer git at videolan.org
Thu May 29 23:55:49 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 23:50:56 2014 +0200| [cb8763bda7e5e59064193e6b29b0f806560f66d3] | committer: Michael Niedermayer

Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'

* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
  svq1enc: Rename SVQ1Context to SVQ1EncContext

Conflicts:
	libavcodec/svq1enc.c

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

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





More information about the ffmpeg-cvslog mailing list