summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* 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>
* | avformat/network: Check for av_malloc* failures in ff_tls_init()Michael Niedermayer2015-02-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "avformat/mpegtsenc: Change the service_type field to enum"Michael Niedermayer2015-02-02
| | | | | | | | | | | | | | This isnt safe due to AVOption accessing this field as int i just realized a moment after pushing This reverts commit 0935453e84a17035f0c3544913e7ab7775839176.
* | avformat/mpegtsenc: Change the service_type field to enumMichael Niedermayer2015-02-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mpegtsenc: allow to set service_type in sdtdhead6662015-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an option to set the service type in mpegts as defined in ETSI 300 468. I added what I believe are the most useful service types as pre defined values, the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07). I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend, when the service type set right tvheadend recognize the mpegts stream as a radio channel. The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream. This close issue 4118. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/omadec: fix number suffixMichael Niedermayer2015-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smacker: Fix number suffixMichael Niedermayer2015-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Fix number suffixesMichael Niedermayer2015-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Fix number suffixes in tb_unreliable()Michael Niedermayer2015-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggenc: Simplify by using OFFSET and PARAMMichael Niedermayer2015-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'Michael Niedermayer2015-02-01
|\| | | | | | | | | | | | | | | | | | | * commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16': ogg: Provide an option to offset the serial number Conflicts: libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Provide an option to offset the serial numberLuca Barbato2015-02-01
| | | | | | | | | | The ogg serial number doubles as codec id and sequence value for concatenated samples.
* | avformat/cache: pass options to the underlying protocol via the url_open2Zhang Rui2015-01-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mov: remove unneeded #include, there are no assert()Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mux: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/utils: remove unneeded #include, there are no assert() only av_assert*Paul B Mahol2015-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/rtpdec_qdm2: change assert to av_assert0()Paul B Mahol2015-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/nut: support WavPackPaul B Mahol2015-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/nut: add GIF[0]Paul B Mahol2015-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'Michael Niedermayer2015-01-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4': yuv4mpegdec: initialize field_order in yuv4_read_header() Conflicts: libavformat/yuv4mpegdec.c See: 52a17972defa118705a4020a6d0bb3ad277df819 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpegdec: initialize field_order in yuv4_read_header()Vittorio Giovara2015-01-29
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1265721
* | 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>
* | avformat/aviobuf: Allow seeking to the end of the buffer for read only buffersMichael Niedermayer2015-01-28
| | | | | | | | | | | | This undoes the effect of 3c18a7b18807de81566381a1bcbe9f6103c0296b for reading Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'Michael Niedermayer2015-01-28
|\| | | | | | | | | | | | | | | | | | | * commit '3c18a7b18807de81566381a1bcbe9f6103c0296b': avio: Do not consider the end-of-buffer position valid Conflicts: libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>