[FFmpeg-cvslog] Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'

Michael Niedermayer git at videolan.org
Mon Feb 10 03:54:34 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 03:42:06 2014 +0100| [51290068fa12995f68cff0ee309064f4cf6e788d] | committer: Michael Niedermayer

Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'

* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
	Changelog
	libavcodec/dnxhddata.c
	libavcodec/dnxhddec.c

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

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





More information about the ffmpeg-cvslog mailing list