Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 22:09:00 +0000 (00:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 22:09:00 +0000 (00:09 +0200)
commitdd3f1563d7666b631035644ea690c20b00ec91de
treef84e0be8481394b98e42d41c135460f4872799b5
parent979062fe2febb502e8b75e944e61673cf70c79b7
parentb69183f65d0f6f4cd7a4e6c0deb57d59b0185aba
Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'

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

Conflicts:
libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nutenc.c