Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'

Browse Source

* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

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

pull/49/head

Michael Niedermayer 11 years ago

parent e975c147e1 d1916d13e2

commit f21ca39e81

1 changed files with 2 additions and 2 deletions

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

Write Preview

Loading…

Cancel

Save