Merge commit '7716dd9fbb'

Browse source

* commit '7716dd9fbb':
  xvid: switch to xvid mmx idct as soon as possible

Conflicts:
	libavcodec/mpeg4videodec.c

Not merged, as the bug was not merged either

See: 6c9b82b6a0, and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-01-31 15:16:44 +01:00

parent e53ec2fe38 7716dd9fbb

commit 3f9e2aad34

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 is not available