Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 20:35:30 +0000 (22:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 20:35:30 +0000 (22:35 +0200)
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
libavformat/flvdec.c

See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/flvdec.c

Simple merge