Michael Niedermayer 2e97437657 Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878' ...

* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
  DPX parser

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

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

2014-12-19 03:30:40 +01:00

3.2 KiB

Raw Blame History

View Raw