Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2015-07-20 22:35:38 +02:00

parent b97e3e11a9 75c1ed2e4c

commit 5cc3faf619

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available