-
Michael Niedermayer authored
* commit '05fb4c9a': proresenc: Do not entangle coded_frame Conflicts: libavcodec/proresenc_kostya.c Merged-by:
Michael Niedermayer <michael@niedermayer.cc>
f2a581e2
* commit '05fb4c9a': proresenc: Do not entangle coded_frame Conflicts: libavcodec/proresenc_kostya.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>