summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/http: Added http_proxy optionJoel Holdsworth2015-12-271-1/+3
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avio: add detail to avio_printf() size warningReynaldo H. Verdejo Pinochet2015-12-272-2/+2
| | | | | | | Previous "currently size is limited" didn't give away much in terms of useful info. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* avformat/img2dec: Reuse main IO context instead of reopening a single fileMichael Niedermayer2015-12-261-3/+9
| | | | | | Fixes part of Ticket4849 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/img2dec: Skip checking the input files existence if it has already ↵Michael Niedermayer2015-12-261-3/+3
| | | | | | | | | been opened Avoids a unneeded open Fixes part of Ticket4849 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mpegts: consider stream_type 4 just a hint toward mp3 and not definiteMichael Niedermayer2015-12-241-0/+2
| | | | | | Fixes Ticket 4864 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mpegtsenc: add flag to embed an AC-3/E-AC-3 ES the DVB wayStefan Pöschel2015-12-242-2/+19
| | | | | | | | | | So far an AC-3 elementary stream is refered to in the PMT according to System A (ATSC). An E-AC-3 ES in contrast is embedded the System B (DVB) way. To fix this inconsistency, this commit changes the default E-AC-3 behaviour to use the ATSC way, too. Furthermore a new flag is added to optionally select the DVB way (regarding both codecs and possible further differences in the future). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/subtitles: treat negative duration like unknown durationwm42015-12-231-1/+1
| | | | | | | | | Fixes a specific srt sample, which has an event with negative duration. libavcodec will convert an event with negative duration to an ASS event which will be displayed forever, which is not wanted here. Treat negative duration always as unknown duration instead, and show it until the next subtitle event.
* mlvdec: validate bits_per_coded_sampleAndreas Cadhalpun2015-12-221-0/+12
| | | | | | | | | | | A negative bits_per_coded_sample doesn't make sense. If it is too large, the size calculation for av_get_packet overflows, resulting in allocation of a too small buffer. Also make sure width and height are sane. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat/movenc-test: Make format staticMichael Niedermayer2015-12-221-1/+1
| | | | | | Makes greping for non static consts easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Update handbrake_version threshold for full mp3 parsingMichael Niedermayer2015-12-221-1/+1
| | | | | | Fixes: Endangered\ Species\ 1x01\ Collecting\ Merl.mp4 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/rmdec: Use correct format specifier for int64_t.Carl Eugen Hoyos2015-12-221-1/+1
| | | | Fixes ticket #5100.
* lavf/avformat: add av_warn_unused_result to avformat_write_headerGanesh Ajjanagadde2015-12-211-0/+1
| | | | | | May be useful as a defense, see e.g c62d1780fff8a1997dd1707bbc557efc8fe41e3c. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* lavf/img2enc: add atomic_writing optionClément Bœsch2015-12-211-1/+3
| | | | | This behaviour change caused a regression on our side recently, we might want to disable the option by default.
* nuv: sanitize negative fps rateAndreas Cadhalpun2015-12-201-0/+9
| | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* mlvdec: check that index_entries existAndreas Cadhalpun2015-12-201-0/+5
| | | | | | | This fixes NULL pointer dereferencing. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* lavf/hlsenc: replace round by lrintGanesh Ajjanagadde2015-12-191-1/+1
| | | | | | | Mainly cosmetic here. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* nutdec: reject negative value_len in read_sm_dataAndreas Cadhalpun2015-12-191-1/+1
| | | | | | | | | | | If it is negative, it can cause the byte position to move backwards in avio_skip, which in turn makes sm_size negative and thus size larger than the size of the packet buffer, causing invalid writes in avio_read. Also fix potential overflow of avio_tell(bc) + value_len. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* nutdec: only copy the header if it existsAndreas Cadhalpun2015-12-191-1/+2
| | | | | | | | Fixes ubsan runtime error: null pointer passed as argument 2, which is declared to never be null Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* oggparsedaala: sync with current bitstream syntaxRostislav Pehlivanov2015-12-181-0/+4
| | | | | | | Since the parser was merged back almost 2 months ago this is the first time the bitstream of the container has been updated. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* Merge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'Hendrik Leppkes2015-12-181-2/+2
|\ | | | | | | | | | | | | * commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31': matroskadec: Fix sample_aspect_ratio for stereo matroska content Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * matroskadec: Fix sample_aspect_ratio for stereo matroska contentAaron Colwell2015-12-071-2/+34
| | | | | | | | | | | | | | | | | | matroskaenc applies divisors to the display width/height when generating stereo content. This patch adds the corresponding multipliers to matroskadec so that the original sample aspect ratio can be recovered. Signed-off-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * rtsp: free opts dictionary on failure of getnameinfoGanesh Ajjanagadde2015-12-071-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc-test: add a missing va_end callGanesh Ajjanagadde2015-12-071-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/oggparsedirac: Export sample aspect ratioMichael Niedermayer2015-12-171-0/+3
| | | | | | | | | | Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/xmv: Add *.xmv to the recognized extensions for the XMV format.rsn88872015-12-171-0/+1
| |
* | Merge commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd'Hendrik Leppkes2015-12-171-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd': mxfenc: always assume long gop Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mxfenc: always assume long gopAnton Khirnov2015-12-061-1/+1
| | | | | | | | | | | | Checking the codec context parameters to find out this information is far too unreliable to be useful, so it is safer to assume B-frames are always present.
* | Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'Hendrik Leppkes2015-12-171-13/+18
|\ \ | |/ | | | | | | | | | | * commit 'e02de9df4b218bd6e1e927b67fd4075741545688': lavc: export Dirac parsing API used by the ogg demuxer as public Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: export Dirac parsing API used by the ogg demuxer as publicAnton Khirnov2015-12-061-9/+22
| | | | | | | | Also, stop using AVCodecContext for storing the stream parameters.
* | Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'Hendrik Leppkes2015-12-171-5/+10
|\ \ | |/ | | | | | | | | | | * commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca': mpegenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegenc: use the CPB props side dataAnton Khirnov2015-12-061-5/+10
| | | | | | | | | | Do not access the encoder options, since it makes no sense when the AVStream codec context is not the encoding context.
* | Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'Hendrik Leppkes2015-12-171-3/+6
|\ \ | |/ | | | | | | | | | | * commit '5845a8273e4694e0254ad728970b82bb64fd8bc0': movenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: use the CPB props side dataAnton Khirnov2015-12-061-5/+8
| | | | | | | | | | Do not access the encoder options, since it makes no sense when the AVStream codec context is not the encoding context.
* | avformat/swfenc: Check frama rate before writing itMichael Niedermayer2015-12-171-0/+4
| | | | | | | | | | | | Fixes assertion failure with ffserver Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffm: reject invalid codec_id and codec_typeAndreas Cadhalpun2015-12-151-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | A negative codec_id cannot be handled by the found_decoder API of AVStream->info: if the codec_id is not recognized, found_decoder is set to -codec_id, which has to be '<0' according to the API documentation. This can cause NULL pointer dereferencing in try_decode_frame. Also make sure the codec_type matches the expected one for codec_id. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | movenc: support cenc (common encryption)erankor2015-12-155-8/+603
| | | | | | | | | | | | | | | | | | | | | | | | support writing encrypted mp4 using aes-ctr, conforming to ISO/IEC 23001-7. 3 new parameters were added: - encryption_scheme - allowed values are none (default) and cenc-aes-ctr - encryption_key - 128 bit encryption key (hex) - encryption_kid - 128 bit encryption key identifier (hex) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfenc: Do not crash if there is no packet in the first streamMichael Niedermayer2015-12-131-0/+4
| | | | | | | | | | | | Fixes: Ticket4914 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/tee: fix side data double free.Nicolas George2015-12-131-0/+2
| | | | | | | | | | | | | | | | Similar to 33fefdb44. Fix trac ticket #4921. Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/hlsenc: Check the return code of avformat_write_header()Michael Niedermayer2015-12-131-2/+5
| | | | | | | | | | | | | | Fixes: segfault Fixes: Ticket5067 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Enable parser for mp3s by old HandBrakeMichael Niedermayer2015-12-132-0/+14
| | | | | | | | | | | | Fixes Ticket5047 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfenc: Fix integer overflow in length computationMichael Niedermayer2015-12-131-2/+2
| | | | | | | | | | | | Fixes: CID1341577 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/segment: Fix memory leak of cur_entry.filenameLvqier2015-12-121-3/+3
| | | | | | | | | | Solution suggested-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/matroskadec: Set codec_tag also for audio codecs.Carl Eugen Hoyos2015-12-121-0/+2
| | | | | | | | | | This was already done for "A_MS/ACM" mkv files and it is done for mov files but was not done for A_QUICKTIME" mkv files.
* | avformat/mpegtsenc: Add basic multi program supportMichael Niedermayer2015-12-111-15/+42
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: Add av_program_add_stream_index()Michael Niedermayer2015-12-116-7/+7
| | | | | | | | | | | | This will be used by the subsequent commit(s) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | diracdec: Extract version parametersKieran Kunhya2015-12-101-1/+3
| |
* | diracdec: Move strides to bytes, and pointer types to uint8_t.Kieran Kunhya2015-12-101-2/+2
| | | | | | | | | | Start templating functions for move to support 10-bit Parts of this patch were written by Rostislav Pehlivanov
* | lavf/mpjpegdec: Fixed dereference after null checkAlex Agranovsky2015-12-091-2/+4
| | | | | | | | | | | | Fixes Coverity CID 1341576 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/rmdec: Fix use of uninitialized variableMichael Niedermayer2015-12-091-1/+1
| | | | | | | | | | | | Fixes: CID1341580 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/flacdec: remove unused return code assignmentMichael Niedermayer2015-12-091-3/+3
| | | | | | | | | | | | Fixes CID1271811 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
View Lorry Controller Status