Commit 5cc3faf6 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents b97e3e11 75c1ed2e
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