Stefano Sabatini
aeccb522eb
lavf/concatdec: fix crash in case a file in script cannot be opened
2013-12-18 15:14:58 +01:00
Michael Niedermayer
1f87cbe834
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
...
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
avf: move url utility functions in a separate file
Conflicts:
libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17 00:09:31 +02:00
Nicolas George
ca2f6b6932
lavf/concat: reject empty scripts.
...
Fix trac ticket #2566 .
2013-05-15 16:53:35 +02:00
Nicolas George
d608a27d9e
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
2013-05-04 14:11:53 +02:00
Nicolas George
de1a71595d
lavf/concatdec: support seeking.
2013-03-20 20:59:24 +01:00
Nicolas George
de1568a452
lavf/concatdec: fix possible leak in case of malloc failure.
...
Fix CID 747737.
2013-03-20 13:35:24 +01:00
Nicolas George
c31458c334
lavf/concat: compute duration if possible.
2013-03-05 16:44:51 +01:00
Nicolas George
3ab25e4574
Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"
...
This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88.
Conflicts:
libavformat/version.h
Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.
2013-03-05 14:10:10 +01:00
Stefano Sabatini
6cc12353a8
lavf/concatdec: define "ffcat" and "ffconcat" extensions
2013-02-28 00:16:33 +01:00
Nicolas George
ea2de3d096
lavf/concatdec: add the "duration" directive.
2013-02-24 13:12:46 +01:00
Nicolas George
b68dd8a161
lavf/concatdec: allow probing.
2013-02-13 14:58:50 +01:00
Nicolas George
db9dc5154d
lavf/concatdec: add signature directive.
2013-02-13 14:58:50 +01:00
Nicolas George
6d680d20ad
lavf/concatdec: add safe option.
2013-02-13 14:58:50 +01:00
Michael Niedermayer
8976ef7aec
concatdec: change data type to suppress warning about limited range of data type on some platforms.
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 17:31:34 +01:00
Nicolas George
16c3cb9bbf
lavf/concatdec: avoid leaking URLs.
...
Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.
2012-12-12 12:15:57 +01:00
Nicolas George
32aedebdc5
lavf: add a concat demuxer.
2012-12-06 14:09:14 +01:00
