Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:16:53 +0000 (15:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:34:49 +0000 (15:34 +0200)
commita33ed6bc74b6b8ada925c76c4084afcf8870a048
tree605fa1fc8e55698f892837e7d0191da5e5c34c1c
parentf391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2
parentb7f1010c8fce09096057528f7cd29589ea1ae7df
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@gmx.at>
cmdutils.c
configure
doc/APIchanges
libavformat/md5enc.c
libavformat/md5proto.c
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
tools/graph2dot.c