Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 19:53:19 +0000 (20:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 19:53:19 +0000 (20:53 +0100)
* commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3':
  dpx: always write the image offset

Conflicts:
libavcodec/dpxenc.c
tests/ref/lavf/dpx

See: 361319d0f49475bc14c744194870f9bab78a8a83
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge