Merge commit '6503cbf842a026faec517eb980551089168c7d8a'

Browse Source

* commit '6503cbf842a026faec517eb980551089168c7d8a':
  ffv1enc: Add const attribute to input frame

Conflicts:
	libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-05-01 21:34:35 +02:00

parent c9ac9adb46 6503cbf842

commit 9aff7d41f6

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

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

Diff Content Not Available