Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'

Browse Source

* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

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

pull/97/head

Michael Niedermayer 10 years ago

parent 057b74d19c 59846452af

commit 45660c7d1b

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available