summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
Commit message (Collapse)AuthorAge
* lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.Nicolas George2016-04-26
| | | | Fix remuxing H.264-in-MP4 to Matroska, possibly others.
* lavf/concatdec: remove unrelated change during codecpar merge.Nicolas George2016-04-26
| | | | | | | 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-11
|
* Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-10
| | | | | | | | | | | | | | | | * 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-10
| | | | | | | | | 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-04
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf/concatdec: do not access packet if av_read_frame returned errorMarton Balint2016-01-10
| | | | | 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-04
|
* concatdec: add option for adding segment start time and duration metadataMarton Balint2015-11-25
| | | | | 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-25
| | | | | | | | 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-25
| | | | | 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-27
|
* concatdec: fix file_start_time calculation regressionMarton Balint2015-10-17
| | | | | | | | 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-05
| | | | | | | 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-03
| | | | | | | | 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-11
| | | | | | Should fix ticket #4765. Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: add support for injecting packet metadataMarton Balint2015-07-17
| | | | | 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-17
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* concatdec: store eof condition in contextMarton Balint2015-07-17
| | | | | | | | 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-17
| | | | | 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-01
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: Enable auto_convert by defaultMichael Niedermayer2015-05-29
| | | | | | | | 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-29
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: handle NOPTS start_time.Nicolas George2014-12-15
| | | | | | | 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-19
| | | | Help debugging timestamp conversion issues.
* avformat: Add and use ff_copy_whitelists()Michael Niedermayer2014-10-24
| | | | | | | 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-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: fix "warning: explicitly assigning a variable of type ↵Michael Niedermayer2014-09-10
| | | | | | | 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-29
|
* lavf/concatdec: reindent after last commit.Nicolas George2014-04-29
|
* lavf/concatdec: always do stream matching.Nicolas George2014-04-29
|
* lavf/concatdec: check match_streams() return value.Nicolas George2014-04-29
|
* lavf/concatdec: use a structure for each stream.Nicolas George2014-04-29
|
* lavf/concatdec: allow to match streams by id.Nicolas George2014-03-23
| | | | | | 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-08
|
* lavf/concatdec: more reliable test for absolute URLs.Nicolas George2014-03-08
| | | | | | | 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-10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/concatdec: fix crash in case a file in script cannot be openedStefano Sabatini2013-12-18
|
* Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-17
| | | | | | | | | | * 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-15
| | | | Fix trac ticket #2566.
* lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.Nicolas George2013-05-04
|
* lavf/concatdec: support seeking.Nicolas George2013-03-20
|
* lavf/concatdec: fix possible leak in case of malloc failure.Nicolas George2013-03-20
| | | | Fix CID 747737.
* lavf/concat: compute duration if possible.Nicolas George2013-03-05
|
* Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"Nicolas George2013-03-05
| | | | | | | | | | | | | 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.
* lavf/concatdec: define "ffcat" and "ffconcat" extensionsStefano Sabatini2013-02-28
|
* lavf/concatdec: add the "duration" directive.Nicolas George2013-02-24
|
* lavf/concatdec: allow probing.Nicolas George2013-02-13
|
* lavf/concatdec: add signature directive.Nicolas George2013-02-13
|
* lavf/concatdec: add safe option.Nicolas George2013-02-13
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 18:47:45 +0000