Michael Niedermayer
6659364d3a
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
...
* commit '797f2a791397210ec1b591b326658805c5dbf104':
hdsenc: Check the init_file() return code
hdsenc: Fix an off by one error in an array size check
hdsenc: Avoid integer overflow
Conflicts:
libavformat/hdsenc.c
See: 572965c9a6
See: 3dbf9afe85
See: 6722e564a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-14 22:17:17 +01:00
Michael Niedermayer
797f2a7913
hdsenc: Check the init_file() return code
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:46 +02:00
Michael Niedermayer
b8ed15d637
hdsenc: Fix an off by one error in an array size check
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:42 +02:00
Michael Niedermayer
417927af3c
hdsenc: Avoid integer overflow
...
Also remove a silly leftover pair of parentheses.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-12-14 17:48:28 +02:00
Michael Niedermayer
3dbf9afe85
libavformat/hdsenc: check init_file() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 21:04:24 +01:00
Michael Niedermayer
6722e564a8
avformat/hdsenc: fix off by 1 error in array size check
...
Fixes CID1135763, CID1135764
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 20:23:31 +01:00
Michael Niedermayer
572965c9a6
avformat/hdsenc: fix unintentional integer overflow in hds_write_packet()
...
Fixes CID1135762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 16:33:26 +01:00
Michael Niedermayer
95d2fc6a76
avformat/hdsenc: Check rename() return value
...
Fixes CID1135748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 16:30:07 +01:00
Michael Niedermayer
641358addc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 10:38:03 +01:00
Martin Storsjö
435214a757
Add an HDS live fragmenting muxer
...
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-02 10:51:00 +02:00