Merge commit '4d8c28deab2488579f585406110b1be790896e59'

Browse Source

* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

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

pull/72/head

Michael Niedermayer 11 years ago

parent e6a084641a 4d8c28deab

commit e222cfefcd

1 changed files with 1 additions and 1 deletions

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

Write Preview

Loading…

Cancel

Save