* commit '87bd298a':
  DPX parser

Conflicts:
	libavcodec/dpx_parser.c
	libavcodec/version.h

See: 8ec32866
Merged-by: Michael Niedermayer <michaelni@gmx.at>