-
Michael Niedermayer authored
* commit '10a9149d': ffv1enc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/ffv1.h libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
b97e3e11
* commit '10a9149d': ffv1enc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/ffv1.h libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>