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

Merge commit 'b69183f6'


* commit 'b69183f6':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 979062fe b69183f6
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment