Michael Niedermayer 979062fe2f 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>

2014-10-21 23:47:44 +02:00

36 KiB

Raw Blame History

View Raw