Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'

Browse Source

* commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7':
  frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers

Conflicts:
	libavutil/frame.c

No change, as these leftovers have already been removed

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

pull/74/merge

Michael Niedermayer 11 years ago

parent 87988d6569 e070d0a5ca

commit de7b08cbc1

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available