diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 20:53:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 20:53:19 +0100 |
| commit | c9128c2c8318a087365cd2d6de1f500b43bfc684 (patch) | |
| tree | a30f3fcc46e2ef9e8de855a99f59967c4eb2c153 /libavcodec/movtextenc.c | |
| parent | 3cfe1d9b3e656aed8ad89d971fc98693a2f3a983 (diff) | |
| parent | 4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3 (diff) | |
| download | ffmpeg-c9128c2c8318a087365cd2d6de1f500b43bfc684.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/movtextenc.c')
0 files changed, 0 insertions, 0 deletions