summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* ircamdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-31
| | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat/mov: Fix integer truncation in mov_read_uuid()Michael Niedermayer2017-01-30
| | | | | | Fixes Ticket6102 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/msf: fix codec 4 (joint stereo ATRAC3) and alignbnnm2017-01-30
| | | | | | | | | Codec 4 (frame size 98) uses joint stereo per spec and examples. Also removed an incorrect "align" var which wasn't used anyway (it was overwrittern). Probably all/only .AT3 of frame size 98 are JS, too. Signed-off-by: bnnm <bananaman255@gmail.com>
* avformat/Makefile: fix compilation of testprogs when networking is disabledTobias Rapp2017-01-30
| | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* avformat: add SCC muxerPaul B Mahol2017-01-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/sccdec: simplify 2 sscanf callsPaul B Mahol2017-01-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* xvag: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* epafdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* genh: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* boadec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* pvfdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* electronicarts: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* 4xm: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat/ac3dec: Fix to prevent runaway ac3 detection by looking at the ↵Marijn Meijles2017-01-28
| | | | | | | | | actual frame rather than the first detected frame. When detecting a swapped AC3 marker the data of the frame is swapped. However, in subsequent frames the data swapped is taken from the first frame rather than the current frame. Signed-off-by: Marijn Meijles <marijn@bitpit.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: Ignore ID3v2 tags if other tags are present e.g. vorbisPaul Arzelier2017-01-28
| | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/matroskaenc: don't reserve more bytes than needed for the Colour ↵James Almer2017-01-28
| | | | | | | master size Found-by: Aaron Colwell <acolwell@google.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/sccdec: attempt to fix valgrind issuePaul B Mahol2017-01-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat: fix ID3v2 parser for v2.2 comment framesChris Moeller2017-01-28
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mov: Fix spherical metadata_source parsingAaron Colwell2017-01-27
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* lavf/matroskaenc.c: Free dyn bufs in mkv_free. Fixes memory leaks when ↵Sasi Inguva2017-01-27
| | | | | | | muxing fails. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/img2dec: Reduce the probe score for incomplete jpgs.Carl Eugen Hoyos2017-01-27
| | | | Ensures that probing doesn't finish prematurely for small files.
* avformat/matroskadec: ProjectionPrivate is optional on Equirectangular ↵James Almer2017-01-26
| | | | | | | | projections This reflects a recent change to the spec draft. Signed-off-by: James Almer <jamrial@gmail.com>
* tcp: set socket buffer sizes before listen/connect/acceptJoel Cunningham2017-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From e24d95c0e06a878d401ee34fd6742fcaddeeb95f Mon Sep 17 00:00:00 2001 From: Joel Cunningham <joel.cunningham@me.com> Date: Mon, 9 Jan 2017 13:37:51 -0600 Subject: [PATCH] tcp: set socket buffer sizes before listen/connect/accept Attempting to set SO_RCVBUF and SO_SNDBUF on TCP sockets after connection establishment is incorrect and some stacks ignore the set call on the socket at this point. This has been observed on MacOS/iOS. Windows 7 has some peculiar behavior where setting SO_RCVBUF after applies only if the buffer is increasing from the default while decreases are ignored. This is possibly how the incorrect usage has gone unnoticed Unix Network Programming Vol. 1: The Sockets Networking API (3rd edition, seciton 7.5): "When setting the size of the TCP socket receive buffer, the ordering of the function calls is important. This is because of TCP's window scale option, which is exchanged with the peer on SYN segments when the connection is established. For a client, this means the SO_RCVBUF socket option must be set before calling connect. For a server, this means the socket option must be set for the listening socket before calling listen. Setting this option for the connected socket will have no effect whatsoever on the possible window scale option because accept does not return with the connected socket until TCP's three-way handshake is complete. This is why the option must be set on the listening socket. (The sizes of the socket buffers are always inherited from the listening socket by the newly created connected socket)" Signed-off-by: Joel Cunningham <joel.cunningham@me.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/flacdec: Check avio_read result when reading flac block header.Frank Liberato2017-01-25
| | | | | | Return AVERROR_INVALIDDATA if all four bytes aren't present. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: add Scenarist Closed Captions demuxerPaul B Mahol2017-01-25
| | | | | | Fixes #4767. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat: add Sample Dump eXchange demuxerPaul B Mahol2017-01-25
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavf/mov: Unscramble dref debug output.Carl Eugen Hoyos2017-01-25
|
* isom: map xalg and avlg to h264, fixes ticket #6099compn2017-01-24
|
* lavf/rtmpproto: Make bytes_read variables 64bit.Carl Eugen Hoyos2017-01-25
| | | | | | | | | When bytes_read overflowed, last_bytes_read did not yet overflow and no bytes-read report was created leading to a timeout. Analyzed-by: Thomas Bernhard Fixes ticket #5836.
* avformat/hlsenc: improve to write m3u8 head blockSteven Liu2017-01-24
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/flvenc: refine the flvenc shift_data codeSteven Liu2017-01-24
| | | | | | refine the flvenc shift_data move data option Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: refine the code readable for time unitSteven Liu2017-01-24
| | | | | | Reviewed-by: Bodecs Bela <bodecsb@vivanet.hu> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* libavformat/tee: tee was passing a wrong option name for fifo's format_optionsFelipe Astroza2017-01-24
| | | | | | | | If fifo is enabled on tee muxer, ffmpeg exits because of an unknown option passed to fifo muxer. Option name "format_options" was replaced by "format_opts" on tee muxer. Signed-off-by: Felipe Astroza <felipe@astroza.cl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/segment: fix crash when failing to open segment listRodger Combs2017-01-23
| | | | | | | | | | | | | | | This happens because segment_end() returns an error, so seg_write_packet never proceeds to segment_start(), and seg->avf->pb is never re-set, so we crash with a null pb when av_write_trailer flushes the packet queue. This doesn't seem to be clearly recoverable, so I'm just failing more gracefully. Repro: ffmpeg -i input.ts -f segment -c copy -segment_list /noaxx.m3u8 test-%05d.ts (assuming you don't have write access to /)
* avformat: add MIDI Sample Dump Standard demuxerPaul B Mahol2017-01-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/wavdec: enable seeking with XMA2Paul B Mahol2017-01-20
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: fix too many open files bugSteven Liu2017-01-20
| | | | | | | | When use http method to delete the old segments, there is only io_open, hove not io_close yet, this patch is used to fix it Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/caf: add 'aacl' codec tagPiotr Bandurski2017-01-19
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: pass output stream duration as a hint to the muxerTobias Rapp2017-01-19
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wmaprodec: >2 channel support for XMAPaul B Mahol2017-01-19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: fix bug of hlsenc http delete old segmentsSteven Liu2017-01-19
| | | | | | | | when push hls to http server, the old segemnts can not delete by hls formats. so add the http option into hls_delete_old_segments Reported-by: Yin Jiaoyuan <yinjiaoyuan@163.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: remove debug message used error level logSteven Liu2017-01-18
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* libavformat/mpegtsenc: support hevc with missing in stream headers like h.264Michael Niedermayer2017-01-17
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: Fix standalone compilation of aiff and caf muxers.Carl Eugen Hoyos2017-01-16
|
* avformat/aadec: use avio_get_str()Paul B Mahol2017-01-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/aadec: stop ignoring file metadataPaul B Mahol2017-01-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec: add SIPR parserPaul B Mahol2017-01-16
| | | | | | Fixes #2056. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* libopenmpt: add missing avio_read return value checkAndreas Cadhalpun2017-01-16
| | | | | | | | | This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* matroskaenc: remove unofficial compliance on color informationRostislav Pehlivanov2017-01-15
| | | | | | | | | | When support for this was added the details weren't yet finalized. This is no longer the case. Fixes writing of mkv/webm files with HDR. Reported-by: Kagami Hiiragi <kagami@genshiken.org> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com>
* Cosmetics: Reindent after last commit.Carl Eugen Hoyos2017-01-14
|