Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'

Browse Source

* commit 'e9ba3098319f78c91470c05da988d865491852c5':
  assdec: check av_new_packet return value

Conflicts:
	libavformat/assdec.c

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

pull/71/merge

Michael Niedermayer 10 years ago

parent 66b2a3fa31 e9ba309831

commit a3b1e42ec4

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