Skip to content
Snippets Groups Projects
Commit c9128c2c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '4843a9c7' 


* commit '4843a9c7':
  dpx: always write the image offset

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

See: 361319d0
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3cfe1d9b 4843a9c7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment