Merge commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'

Browse Source

* commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37':
  Move Indeo4 frametypes into common header.

Conflicts:
	libavcodec/ivi_common.c

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

...

This commit is contained in:

Michael Niedermayer

2014-06-01 17:39:21 +02:00

parent 909dbb07eb 3df0d20028

commit 571effb330

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