Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:29:30 +0000 (03:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:30:40 +0000 (03:30 +0100)
commit2e974376570d41b3e7c16fa53b9af2023a81e39a
tree9e6899ab936a027d296c24f1ab9e085e4cae1d30
parent9aabe6678147d947ce7a32bf9bb1e087fac7fdde
parent87bd298abeb901fe16383a0d267502cc7fc03878
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'

* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
  DPX parser

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

See: 8ec328668a7d10c8224ae5f591add5b388ea82ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dpx_parser.c
libavcodec/version.h