Commit a3b1e42e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e9ba3098'

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

Conflicts:
	libavformat/assdec.c

See: 7c9f9685Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 66b2a3fa e9ba3098
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment