[FFmpeg-cvslog] Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

Michael Niedermayer git at videolan.org
Fri May 22 22:48:11 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 22 21:25:57 2015 +0200| [f275f9eaee9c69bcbc732002f0ee36f480eebb85] | committer: Michael Niedermayer

Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
	libavcodec/mpegvideo.c

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

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





More information about the ffmpeg-cvslog mailing list