[FFmpeg-cvslog] Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'
Michael Niedermayer
git at videolan.org
Mon Dec 8 21:00:49 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 8 20:53:19 2014 +0100| [c9128c2c8318a087365cd2d6de1f500b43bfc684] | committer: Michael Niedermayer
Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'
* commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3':
dpx: always write the image offset
Conflicts:
libavcodec/dpxenc.c
tests/ref/lavf/dpx
See: 361319d0f49475bc14c744194870f9bab78a8a83
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9128c2c8318a087365cd2d6de1f500b43bfc684
---
More information about the ffmpeg-cvslog
mailing list