Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'

Browse Source

* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
  libxavs: rename and fix a variable name

Conflicts:
	libavcodec/libxavs.c

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

...

This commit is contained in:

Michael Niedermayer 2013-11-21 11:57:49 +01:00

parent f0f75dfa34 a7b87ca911

commit 074b89f1e2

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