Skip to content
Snippets Groups Projects
Commit 42316907 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'af7ca6ea' 


* commit 'af7ca6ea':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents dd3f1563 af7ca6ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
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