Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-01Merge commit '72d658766e6ccf198317dffd6499c5e288847a1c'Hendrik Leppkes
* commit '72d658766e6ccf198317dffd6499c5e288847a1c': mp3dec: replace avpriv_mpa_decode_header with avpriv_mpegaudio_decode_header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-01Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'Hendrik Leppkes
* commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c': mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-01Merge commit '6bf4c1d71199b92894f24db6386ed5070e590a16'Hendrik Leppkes
* commit '6bf4c1d71199b92894f24db6386ed5070e590a16': r3d: do not create the audio stream until we know the sample rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-01Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'Hendrik Leppkes
* commit '9f1eccb97bf8894cb18b14f642500686505ef186': ff_parse_specific_params: do not use AVCodecContext.frame_size Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-01Merge commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666'Hendrik Leppkes
* commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666': rmenc: do not use AVCodecContext.frame_size Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-31avformat/mov: support cenc (common encryption)erankor
support reading encrypted mp4 using aes-ctr, conforming to ISO/IEC 23001-7. a new parameter was added: - decryption_key - 128 bit decryption key (hex) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-30avformat/movenc: Use strict_std_compliance from the muxer layer instead of ↵Michael Niedermayer
the encoder layer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-12-29oggparsedaala: check number of planes in pixel format mapAndreas Cadhalpun
This fixes crashes caused by out-of-bounds writes. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-29lavf/qtpalette: Treat 1-bit video as palettizedMats Peterson
This commit for qtpalette.c and qtpalette.h adds 1-bit video to the "palettized video" category, since if the video sample description contains a palette, the two colors in the palette can be any color, not necessarily black & white. Unfortunately, I've noticed that the qtrle (QuickTime Animation) decoder blindly assumes that 1-bit video is black & white. I don't have enough knowledge about the decoder to fix this, though. Below is a link to a sample 1-bit QuickTime Animation clip of a rotating earth that uses blueish colors, and they will be correctly rendered in QuickTime, but not in FFmpeg (which will use black & white). https://drive.google.com/open?id=0B3_pEBoLs0faUlItWm9KaGJSTEE Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-28lavf/mpegtsenc: add automatic bitstream filteringRodger Combs
2015-12-28lavf/matroskaenc: add automatic bitstream filteringRodger Combs
2015-12-28lavf: add internal API to append a bsf to a stream's listRodger Combs
2015-12-28lavf: add automatic bitstream filtering; bump versionRodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by which a muxer can add a bitstream filter to a stream automatically, rather than prompting the user to do so.
2015-12-28lavf/tee: use lavf API for applying bitstream filtersRodger Combs
2015-12-28lavf: add API to apply a list of bsfs to a packetRodger Combs
2015-12-28avformat/qtpalette: Move ff_get_qtpalette() doxy to headerMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-28avformat/matroskadec: palettized QuickTime video in MatroskaMats Peterson
Palettized QuickTime video in Matroska has hitherto not been recognized whatsoever, and the "palette" used has been completely random. The patch for matroskadec.c fixes this issue by adding a palette side data packet in matroska_deliver_packet(), much in the same way as it's done in mov.c. Video samples for testing are available at https://drive.google.com/open?id=0B3_pEBoLs0faWElmM2FnLTZYNlk. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-28avformat: factor ff_get_qtpalette() out of mov.cMats Peterson
This consists mainly of moving the palette handling from the mov_parse_stsd_video() function to a new ff_get_qtpalette() function in the new file qtpalette.c, which will be shared by both matroskadec.c and mov.c. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-27avformat/hls: Added http_proxy supportJoel Holdsworth
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-27avformat/hls: Remember to free HLSContext::headersJoel Holdsworth
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-27avformat/http: Added http_proxy optionJoel Holdsworth
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-27avio: add detail to avio_printf() size warningReynaldo H. Verdejo Pinochet
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>
2015-12-26avformat/img2dec: Reuse main IO context instead of reopening a single fileMichael Niedermayer
Fixes part of Ticket4849 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-26avformat/img2dec: Skip checking the input files existence if it has already ↵Michael Niedermayer
been opened Avoids a unneeded open Fixes part of Ticket4849 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-26Remove stray line breaks from avpriv_{report_missing_feature|request_samples}Diego Biurrun
2015-12-26rtpdec_jpeg: Coalesce redundant error checksDiego Biurrun
2015-12-24avformat/mpegts: consider stream_type 4 just a hint toward mp3 and not definiteMichael Niedermayer
Fixes Ticket 4864 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-24avformat/mpegtsenc: add flag to embed an AC-3/E-AC-3 ES the DVB wayStefan Pöschel
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>
2015-12-23avformat/subtitles: treat negative duration like unknown durationwm4
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.
2015-12-22mlvdec: validate bits_per_coded_sampleAndreas Cadhalpun
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>
2015-12-22avformat/movenc-test: Make format staticMichael Niedermayer
Makes greping for non static consts easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-22avformat/mov: Update handbrake_version threshold for full mp3 parsingMichael Niedermayer
Fixes: Endangered\ Species\ 1x01\ Collecting\ Merl.mp4 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-22lavf/rmdec: Use correct format specifier for int64_t.Carl Eugen Hoyos
Fixes ticket #5100.
2015-12-21lavf/avformat: add av_warn_unused_result to avformat_write_headerGanesh Ajjanagadde
May be useful as a defense, see e.g c62d1780fff8a1997dd1707bbc557efc8fe41e3c. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-21lavf/img2enc: add atomic_writing optionClément Bœsch
This behaviour change caused a regression on our side recently, we might want to disable the option by default.
2015-12-20nuv: sanitize negative fps rateAndreas Cadhalpun
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-20mlvdec: check that index_entries existAndreas Cadhalpun
This fixes NULL pointer dereferencing. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-12-19lavf/hlsenc: replace round by lrintGanesh Ajjanagadde
Mainly cosmetic here. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-19nutdec: reject negative value_len in read_sm_dataAndreas Cadhalpun
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>
2015-12-19nutdec: only copy the header if it existsAndreas Cadhalpun
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>
2015-12-19oggparsedaala: sync with current bitstream syntaxRostislav Pehlivanov
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>
2015-12-18Merge commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31'Hendrik Leppkes
* commit 'febfb49a70e82f5ac46dc7ea34dabd4d56b19b31': matroskadec: Fix sample_aspect_ratio for stereo matroska content Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17avformat/oggparsedirac: Export sample aspect ratioMichael Niedermayer
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-17avformat/xmv: Add *.xmv to the recognized extensions for the XMV format.rsn8887
2015-12-17Merge commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd'Hendrik Leppkes
* commit 'b8b21dee0f0b4bcc1888067c497d6e838859d2cd': mxfenc: always assume long gop Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'Hendrik Leppkes
* commit 'e02de9df4b218bd6e1e927b67fd4075741545688': lavc: export Dirac parsing API used by the ogg demuxer as public Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'Hendrik Leppkes
* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca': mpegenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'Hendrik Leppkes
* commit '5845a8273e4694e0254ad728970b82bb64fd8bc0': movenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17avformat/swfenc: Check frama rate before writing itMichael Niedermayer
Fixes assertion failure with ffserver Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-16ffm: reject invalid codec_id and codec_typeAndreas Cadhalpun
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>