Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

Browse Source

* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
	libavfilter/filtfmts.c

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

...

This commit is contained in:

Michael Niedermayer 2013-11-04 21:52:46 +01:00

parent 2865c1b905 e73996954d

commit 4b4a7fcb07

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