ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Oct 21
22:35:30 2014 +0200| [3099008f07808dcf6edb2311fb1ee050444ffd1d] | committer:
Michael Niedermayer
Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
flvdec: make sure to check create_stream and report the same error
Conflicts:
libavformat/flvdec.c
See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3099008f07808dcf6edb2311fb1ee050444ffd1d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog