Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:32:08 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:32:08 +0000 (13:32 +0100)
* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
  dpxenc: mention missing break

Conflicts:
libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge