Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 20:35:38 +0000 (22:35 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 20:35:38 +0000 (22:35 +0200)
commit5cc3faf6198b881e2f0aa65ac72aa2671e5b015b
treeceb13c3b2a682800cbb5abd050039d96838264fc
parentb97e3e11a9c23e45ac3b2c1a7771d55f8fc1caee
parent75c1ed2e4c7250f5e75a11d0140727054ff0136b
Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'

* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
  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>