[FFmpeg-cvslog] Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

Michael Niedermayer git at videolan.org
Fri Oct 12 15:39:44 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 15:16:53 2012 +0200| [a33ed6bc74b6b8ada925c76c4084afcf8870a048] | committer: Michael Niedermayer

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
  tools: do not use av_pix_fmt_descriptors directly.
  pixdesc: add functions for accessing pixel format descriptors.
  build: add support for Tru64 (OSF/1)
  md5: Allocate a normal private context for the opaque md5 context pointer

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffprobe.c
	libavformat/md5enc.c
	libavutil/version.h
	tools/graph2dot.c

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

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





More information about the ffmpeg-cvslog mailing list