Merge commit '75c1ed2e'
* commit '75c1ed2e': ffv1enc: Use input frame to set SAR and interlacing Conflicts: libavcodec/ffv1enc.c No change as the removed coded_frame uses where not in the code anymore Merged-by:Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment