[FFmpeg-cvslog] Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

Michael Niedermayer git at videolan.org
Wed Dec 19 15:49:22 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 14:55:07 2012 +0100| [642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca] | committer: Michael Niedermayer

Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
  mpegvideo: allocate scratch buffers after linesize is known

Conflicts:
	libavcodec/mpegvideo.c

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

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





More information about the ffmpeg-cvslog mailing list