RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
69,425 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

31 Commits

Author SHA1 Message Date
Zhang Rui 038f3a173f avformat/concatdec: avoid NULL dereference when failed to open file. 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 14:25:04 +01:00
Nicolas George acbc2ed26a lavf/concatdec: handle NOPTS start_time. 
Fix trac ticket #3598.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 20:00:35 +01:00
Stefano Sabatini 484d42a097 lavf/concatdec: add timestamp log 
Help debugging timestamp conversion issues.
 2014-11-19 11:17:43 +01:00
Michael Niedermayer 4641ae352e avformat: Add and use ff_copy_whitelists() 
Fixes potential security issue in case of running out of memory

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 19:23:23 +02:00
Michael Niedermayer 5ea0753a15 avformat/concatdec: Forward whitelists to the subdemuxers. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-23 18:19:37 +02:00
Michael Niedermayer 3294fc8c47 avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself" 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-10 11:48:39 +02:00
Nicolas George 50ed6e3ce6 lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02:00
Nicolas George 9d24a536a3 lavf/concatdec: reindent after last commit. 2014-04-29 13:25:59 +02:00
Nicolas George b24d6c5303 lavf/concatdec: always do stream matching. 2014-04-29 13:25:59 +02:00
Nicolas George c27939d871 lavf/concatdec: check match_streams() return value. 2014-04-29 13:25:59 +02:00
Nicolas George e973cf04f6 lavf/concatdec: use a structure for each stream. 2014-04-29 13:25:59 +02:00
Nicolas George 26dea7731e lavf/concatdec: allow to match streams by id. 
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
 2014-03-23 19:15:07 +01:00
Nicolas George 6bffa83bbe lavf/concatdec: reindent after last commit. 2014-03-08 12:44:45 +01:00
Nicolas George 8a670f52a5 lavf/concatdec: more reliable test for absolute URLs. 
ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.
 2014-03-08 12:38:31 +01:00
Zhang Rui 4958628ba6 avformat/concatdec: pass the interrupt callback on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 15:42:48 +01:00
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 6cc12353a8.

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