Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

Browse Source

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

Conflicts:
	libavcodec/libtheoraenc.c

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

...

This commit is contained in:

Michael Niedermayer 2015-06-01 02:10:30 +02:00

parent 3377f6fd15 41658bc885

commit fb7b5dc0e6

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