Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'

Browse Source

* commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01':
  Decode both parts of Indeo4 IP frames

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

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

pull/74/head

Michael Niedermayer 11 years ago

parent 571effb330 f76e3669bb

commit 3d820ba909

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