Commit b882079b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e9a6ae77'

* commit 'e9a6ae77':
  dpxenc: mention missing break

Conflicts:
	libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ccfae038 e9a6ae77
Markdown is supported
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