Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'

Browse Source

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

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

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

...

This commit is contained in:

Michael Niedermayer 2014-06-01 17:54:28 +02:00

parent 571effb330 f76e3669bb

commit 3d820ba909

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

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

Diff Content Not Available