Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 21:47:44 +0000 (23:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 21:47:44 +0000 (23:47 +0200)
commit979062fe2febb502e8b75e944e61673cf70c79b7
tree625cd7520f4de1607c25ff151146814352624aed
parent840bc8e284c8eead7f0f319e846f911dfb3fd48f
parentbe42c0b8d57fe2ea769892d102ffd5561dc18709
Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'

* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
libavformat/rmdec.c

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