[FFmpeg-cvslog] Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

Michael Niedermayer git at videolan.org
Fri Nov 8 18:01:31 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  8 17:25:13 2013 +0100| [a30f7918b52d076c55a42bef3a731165b354bf08] | committer: Michael Niedermayer

Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

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

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





More information about the ffmpeg-cvslog mailing list