Michael Niedermayer 3099008f07 Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae' ...

* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
	libavformat/flvdec.c

See: d7d5b5dfc1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-21 22:35:30 +02:00

37 KiB

Raw Blame History

View Raw