summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/isom: add X-Com Radvision fourccPaul B Mahol2015-02-11
| | | | | | Fixes bug #4303. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'Michael Niedermayer2015-02-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9deaec782810d098bca11c9332fab2d2f4c5fb78': lavf: move internal fields from public to internal context Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move internal fields from public to internal contextwm42015-02-10
| | | | | | | | | | | | | | This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | * commit '1509c018bd5b054a2354e20021ccbac9c934d213': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: relax restrictions on matching the packet start in read_headerAnton Khirnov2015-02-10
| | | | | | | | | | | | | | | | | | | | | | analyze() is currently called both when probing and from read_header(). It determines the packet start by looking for the sync byte, followed by unset Transport Error Indicator and valid adaptation_field_control. This makes sense to do when probing, but once we already know the format is MPEG-TS, it is counterproductive to be so strict -- e.g. in some files the TEI might be set and analyze() might get called with a smaller buffer than the one used for probing, resulting in a failure.
* | Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code Conflicts: libavformat/seek.c libavformat/seek.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove unused codewm42015-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses it, and it provides no public API. Archeological finds: Commit 101036adb9 added the API. Commit a8dd8dc6e9 made mpegts.c use it. Commit af8aae3fa3 disabled it by default in mpegts.c. Commit ae2bb52cd2 removed all uses of this from mpegts.c. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavformat: DNxHD in .mov, switch unspecified color_range to mpegKevin Wheatley2015-02-10
| | | | | | | | | | | | | | | | | | | | Avid prefers mpeg range [16-235] by default this change brings ffmpeg into line with that. To obtain the old behaviour use '-color_range jpeg' on the command line prior to the ouput filename. Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska: don't complain about unknown elementswm42015-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Matroska is an extensible format - unknown elements must be expected. It shouldn't complain about such elements to the user either; it'll just generate noise. The "error_recognition & AV_EF_EXPLODE" is completely, wrong why would it explode on valid files? It's still useful for debugging, so the message is left in place with a higher log level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix division by 0Michael Niedermayer2015-02-09
| | | | | | | | | | | | | | Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Check dimensions before setting aspectMichael Niedermayer2015-02-09
| | | | | | | | | | | | | | | | Fixes division by 0 Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-02-08
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix standalone compilation of the mov muxer with --disable-optimizations. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix standalone compilation of the mov muxer with --disable-optimizations.Carl Eugen Hoyos2015-02-08
| | | | | | | | | | | | Reported-by: Bernhard Döbler
* | | avformat/internal: fix av_interleaved_write_frame typo referenceClément Bœsch2015-02-08
| | |
* | | avformat/mxfenc: Remove unused variablesMichael Niedermayer2015-02-08
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libavformat/mxfenc.c: added mxf opatom muxerMark Reid2015-02-08
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/omadec: Subtract headersize in timestamp calculationMichael Niedermayer2015-02-07
| | | | | | | | | | | | Fixes pts/dts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/omadec: only compute timestamps based on bitrate if its setMichael Niedermayer2015-02-07
| | | | | | | | | | | | Fixes division by zero Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'Michael Niedermayer2015-02-07
|\| | | | | | | | | | | | | * commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1': oma: Report a timestamp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: Report a timestampLuca Barbato2015-02-07
| | | | | | | | | | | | Reported-By: jb@videolan.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavf/mlv: Only add streams that are supposed to contain frames.Carl Eugen Hoyos2015-02-07
| | | | | | | | | | | | Fixes ticket #4296. Reviewed-by: Peter Ross
* | nutdec: Remove unused variablesTimothy Gu2015-02-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: Remove dead codeTimothy Gu2015-02-06
| | | | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rpl: check av_get_packet() for failurePaul B Mahol2015-02-06
| | | | | | | | | | | | Also make ret signed as it should be from start. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/thp: check av_get_packet() for failurePaul B Mahol2015-02-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/tta: only check for header and seek table crc if requestedJames Almer2015-02-05
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Fix compilation with --disable-protocol=udpCarl Eugen Hoyos2015-02-05
| |
* | avformat/thp: Check av_get_packet() for failure not only for partial outputMichael Niedermayer2015-02-05
| | | | | | | | | | | | | | | | Fixes null pointer dereference Fixes: signal_sigsegv_db2c1f_3108_cov_163322880_pikmin2_opening1_partial.thp Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avc: add buffer padding to extradata allocationLukasz Marek2015-02-05
| | | | | | | | | | | | | | ff_avc_write_annexb_extradata() allocates extradata, but don't add FF_INPUT_BUFFER_PADDING_SIZE value Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behaviorMichael Niedermayer2015-02-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/siff: fix if_( stylePaul B Mahol2015-02-04
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/utils: fix if_( styleStefano Sabatini2015-02-04
| |
* | avformat/mpc8: fix broken pointer mathwm42015-02-04
| | | | | | | | | | | | | | This could overflow and crash at least on 32 bit systems. Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpc8: fix hang with fuzzed filewm42015-02-04
| | | | | | | | | | | | | | | | | | | | | | This can lead to an endless loop by seeking back a few bytes after each attempted chunk read. Assuming negative sizes are always invalid, this is easy to fix. Other code in this demuxer treats negative sizes as invalid as well. Fixes ticket #4262. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '898276c16b1683ac77723e97574a3bfdb29507fd'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | * commit '898276c16b1683ac77723e97574a3bfdb29507fd': r3d: Fix pos type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * r3d: Fix pos typeLuca Barbato2015-02-03
| | | | | | | | | | | | | | avio_tell can return a negative number. Bug-Id: CID 1265715 CC: libav-stable@libav.org
* | Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'Michael Niedermayer2015-02-03
|\| | | | | | | | | | | | | | | | | | | * commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de': tta: Fix framepos and start_offset types Conflicts: libavformat/tta.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tta: Fix framepos and start_offset typesVittorio Giovara2015-02-03
| | | | | | | | | | | | | | Also propagate errors. CC: libav-stable@libav.org Bug-Id: CID 1238812
| * isom: Decode Prores 4444 XQ with the existing Prores decoderCarl Eugen Hoyos2015-02-03
| | | | | | | | | | | | | | The frames seem to contain a higher bitrate which our decoder is able to handle. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat: fix mode of img2dec.c and utils.cMichael Niedermayer2015-02-03
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'Michael Niedermayer2015-02-03
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f': mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom Conflicts: libavformat/mov.c See: b76bc010343b0cff8717cc7ee81e47273272336c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Implement parsing of the "HandlerName" from the MP4 HDLR atomHendrik Leppkes2015-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This atom typically is used for a track title. The handler name is stored as a Pascal string in the QT specs (first byte is the length of the string), so do not export it. A second length check based on the first character is added to avoid overwriting an already specified handler_name (it happens with YouTube videos for instance, the handler_name get masked), or specifying an empty string metadata. The Pascal string fix and the second length check are written by Clément Bœsch <clement.boesch@smartjog.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'Michael Niedermayer2015-02-03
|\| | | | | | | | | | | | | | | | | | | | | * commit '27b99d929fe3440b4bba8e5d970c2802f274f328': siff: Return more meaningful error values Conflicts: libavformat/siff.c See: 29c3ebf56e2b54c68c52668937f74a874ecb49ac Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * siff: Return more meaningful error valuesDiego Biurrun2015-02-03
| |
* | Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'Michael Niedermayer2015-02-03
|\| | | | | | | | | | | | | | | | | | | * commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128': siff: K&R formatting cosmetics Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * siff: K&R formatting cosmeticsDiego Biurrun2015-02-03
| |
* | avformat/img2dec: remove the non-negative number requirement for ↵Liviu Oniciuc2015-02-03
| | | | | | | | | | | | | | | | | | start_number option industrial cameras usually mark the trigger frame as frame number 0 all frames saved before trigger frame receive a negative sequence number Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/tta: fix crash with corrupted fileswm42015-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | av_add_index_entry() can fail, for example because the parameters are invalid, or because memory allocation fails. Check this; it can actually happen with corrupted files. The second hunk is just for robustness. Just in case functions like ff_reduce_index() remove entries. (Not sure if this can actually happen.) Fixes ticket #4294. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Fix build with msvcMatt Oliver2015-02-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: simplify pasp value before setting SARMichael Niedermayer2015-02-03
| | | | | | | | | | | | This avoids a 65536:65536 SAR Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 18:17:18 +0000