Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  snow: use VideoDSPContext

Conflicts:
	libavcodec/snow.c

Nothing merged here, this has already been fixed in ffmpeg long ago

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

pull/8/head

Michael Niedermayer 12 years ago

parent 384dd9804d d615da60c1

commit cbed2426a0

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

Diff Content Not Available