Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

Browse Source

* commit '41658bc88553dab8499e4dfca311559dcbae2674':
  libtheora: Check memory allocation

Conflicts:
	libavcodec/libtheoraenc.c

See: 67d4d5f5db
See: 27216bf314
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/136/head

Michael Niedermayer 10 years ago

parent 3377f6fd15 41658bc885

commit fb7b5dc0e6

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