Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:54:52 +0000 (12:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:56:32 +0000 (12:56 +0100)
commit7f8ef7876efe99e7e9d0e41b0a56530877536496
tree89216011c97d22065a9a30f8429b295f9aff9644
parent76fa78911f58c9707226559e0f57be8d47fb2fca
parente3f50f247155216229e34f165bae8c329d5a001e
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'

* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
  dnxhdenc: check negative index

Conflicts:
libavcodec/dnxhdenc.c

Not merged, the cid index thats taken out of our table will be found again in
said table.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dnxhdenc.c