Merge commit '4843a9c74f77f5eb8d2b1ee648fe2ac6e2a48ec3'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2014-12-08 20:53:19 +01:00

parent 3cfe1d9b3e 4843a9c74f

commit c9128c2c83

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available