aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/concatdec.c
Commit message (Collapse)AuthorAgeFilesLines
...
* avformat/concatdec: add fallback for calculating file durationJustin Ruggles2017-08-311-2/+18
| | | | | | | | | If a file does not have a known duration, this leads to the timestamps starting over for the next file, causing non-monotonic timestamps. To prevent this, track the duration during demuxing and use it to determine the current file duration before opening the next file. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* concatdec: Do not pass NULL to memcmpDerek Buitenhuis2017-07-061-1/+1
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf/concatdec: do not transfer custom IO flagClément Bœsch2017-05-221-1/+1
| | | | | | | If the source is using a custom IO, setting this flag causes heavy leaks since the segments will not have their avio context closed. Regression since f5da453b068f55d335ca403d2e2b4dd2ac3d4331.
* avformat/concatdec: port to the new bitstream filter APIJames Almer2017-05-031-65/+31
| | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/concatdec: fix the h264 annexb extradata checkJames Almer2017-04-251-2/+5
| | | | The start code can be either in the first three or four bytes.
* concatdec: pass AVFormatContext flags to sub demuxerwm42017-03-091-0/+1
|
* avformat/concatdec: don't call open_file when seek position within a fileraymondzheng1412@gmail.com2016-09-281-7/+17
|
* lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.Nicolas George2016-04-261-0/+6
| | | | Fix remuxing H.264-in-MP4 to Matroska, possibly others.
* lavf/concatdec: remove unrelated change during codecpar merge.Nicolas George2016-04-261-5/+0
| | | | | | | Clearing the extradata is not related to the codecpar change, and it breaks if auto_convert is disabled. Fix trac ticket #5461.
* avformat/concatdec: Use correct stream count on closeTimo Rothenpieler2016-04-111-1/+1
|
* Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-101-13/+57
| | | | | | | | | | | | | | | | * commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avformat/concatdec: set safe mode to enabled instead of autoMichael Niedermayer2016-03-101-1/+1
| | | | | | | | | This is safer, as a selected demuxer could still mean that it was auto-detected by a user application Reviewed-previously-by: Nicolas George <george@nsup.org> Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: Add a protocol blacklisting APIDerek Buitenhuis2016-03-041-1/+1
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf/concatdec: do not access packet if av_read_frame returned errorMarton Balint2016-01-101-3/+7
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch2015-12-041-2/+2
|
* concatdec: add option for adding segment start time and duration metadataMarton Balint2015-11-251-0/+10
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: simplify duration calculation in open_next_fileMarton Balint2015-11-251-7/+2
| | | | | | | | If duration is still AV_NOPTS_VALUE when opening the next file, we can assume that outpoint is not set. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: calculate duration early if outpoint is knownMarton Balint2015-11-251-0/+2
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* Replace remaining occurances of av_free_packet with av_packet_unrefHendrik Leppkes2015-10-271-1/+1
|
* concatdec: fix file_start_time calculation regressionMarton Balint2015-10-171-1/+1
| | | | | | | | Fixes ticket #4924. Found-by: Jaroslav Šnajdr <jsnajdr@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: fix metadata memleak on errorMarton Balint2015-10-051-5/+5
| | | | | | | Fixes Coverity CID 1323077. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/concatdec: Check file variable before dereferencingMichael Niedermayer2015-09-031-0/+5
| | | | | | | | Fixes CID1322328 Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* concatdec: fix broken file_inpoint calculationMarton Balint2015-08-111-1/+1
| | | | | | Should fix ticket #4765. Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: add support for injecting packet metadataMarton Balint2015-07-171-0/+28
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: add support for specifying outpoint of filesMarton Balint2015-07-171-4/+25
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: store eof condition in contextMarton Balint2015-07-171-1/+8
| | | | | | | | This is needed later for outpoint support which may leave the last file in a not-eof state. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: add support for specifying inpoint of filesMarton Balint2015-07-171-13/+26
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/concatdec: copy stream metadata when using concatVadim Belov2015-07-011-0/+2
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: Enable auto_convert by defaultMichael Niedermayer2015-05-291-1/+1
| | | | | | | | Users have no means to find out from a failure how to make it work or is it preferred to check and print a warning for h264 concat without auto_convert ? Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: avoid NULL dereference when failed to open file.Zhang Rui2015-01-291-0/+3
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: handle NOPTS start_time.Nicolas George2014-12-151-2/+5
| | | | | | | Fix trac ticket #3598. Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: add timestamp logStefano Sabatini2014-11-191-0/+11
| | | | Help debugging timestamp conversion issues.
* avformat: Add and use ff_copy_whitelists()Michael Niedermayer2014-10-241-3/+2
| | | | | | | Fixes potential security issue in case of running out of memory Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: Forward whitelists to the subdemuxers.Michael Niedermayer2014-10-231-0/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: fix "warning: explicitly assigning a variable of type ↵Michael Niedermayer2014-09-101-4/+4
| | | | | | | int to itself" Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: implement automatic conversions.Nicolas George2014-04-291-1/+84
|
* lavf/concatdec: reindent after last commit.Nicolas George2014-04-291-11/+10
|
* lavf/concatdec: always do stream matching.Nicolas George2014-04-291-31/+68
|
* lavf/concatdec: check match_streams() return value.Nicolas George2014-04-291-1/+4
|
* lavf/concatdec: use a structure for each stream.Nicolas George2014-04-291-12/+19
|
* lavf/concatdec: allow to match streams by id.Nicolas George2014-03-231-16/+90
| | | | | | That makes the concat demuxer usable with MPEG-PS streams, even when the streams in the different parts are detected in different order.
* lavf/concatdec: reindent after last commit.Nicolas George2014-03-081-6/+5
|
* lavf/concatdec: more reliable test for absolute URLs.Nicolas George2014-03-081-1/+12
| | | | | | | 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.
* avformat/concatdec: pass the interrupt callback onZhang Rui2014-02-101-0/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: fix crash in case a file in script cannot be openedStefano Sabatini2013-12-181-0/+3
|
* Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-171-0/+1
| | | | | | | | | | * commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef': avf: move url utility functions in a separate file Conflicts: libavformat/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concat: reject empty scripts.Nicolas George2013-05-151-0/+2
| | | | Fix trac ticket #2566.
* lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.Nicolas George2013-05-041-1/+1
|
* lavf/concatdec: support seeking.Nicolas George2013-03-201-2/+96
|
* lavf/concatdec: fix possible leak in case of malloc failure.Nicolas George2013-03-201-5/+11
| | | | Fix CID 747737.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 22:34:43 +0000