summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc: update merge status for recent additions and skipped mergesHendrik Leppkes2016-11-13
|
* Merge commit '02c2761973dfc886e94a60a9c7d6d30c296d5b8c'Hendrik Leppkes2016-11-13
|\ | | | | | | | | | | | | | | | | * commit '02c2761973dfc886e94a60a9c7d6d30c296d5b8c': avconv_qsv: use the device creation API Not merged, our ffmpeg hwaccel infra is not quite the same as avconvs. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv_qsv: use the device creation APIAnton Khirnov2016-06-25
| |
* | Merge commit '232399e3ee219d16d0e0d482c9f31a26202d4993'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit '232399e3ee219d16d0e0d482c9f31a26202d4993': avconv: pass the hwaccel frames context to the decoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: pass the hwaccel frames context to the decoderAnton Khirnov2016-06-25
| |
* | Merge commit 'a3a0230a9870b9018dc7415ae5872784d524cfe5'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a3a0230a9870b9018dc7415ae5872784d524cfe5': avconv: init filtergraphs only after we have a frame on each input This commit is a noop since it doesn't apply cleanly due to differences in the dataflow between avconv and ffmpeg, and thus fixing this in the scope of a merge is unfeasible. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: init filtergraphs only after we have a frame on each inputAnton Khirnov2016-06-25
| | | | | | | | | | | | | | | | | | This makes sure the actual stream parameters are used, which is important mainly for hardware decoding+filtering cases, which would previously require various weird workarounds to handle the fact that a fake software graph has to be constructed, but never used. This should also improve behaviour in rare cases where avformat_find_stream_info() does not provide accurate information.
* | Merge commit '3e265ca58f0505470186dce300ab66a6eac3978e'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '3e265ca58f0505470186dce300ab66a6eac3978e': avconv: do packet ts rescaling in write_packet() This commit is a noop since it doesn't apply cleanly due to differences in the dataflow between avconv and ffmpeg, and thus fixing this in the scope of a merge is unfeasible. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: do packet ts rescaling in write_packet()Anton Khirnov2016-06-25
| | | | | | | | | | This will be useful in the following commit, after which the muxer timebase is not always available when encoding.
* | Merge commit '50722b4f0cbc5940e9e6e21d113888436cc89ff5'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit '50722b4f0cbc5940e9e6e21d113888436cc89ff5': avconv: decouple configuring filtergraphs and setting output parameters Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: decouple configuring filtergraphs and setting output parametersAnton Khirnov2016-06-25
| | | | | | | | | | | | | | | | | | | | Currently, a filtergraph will pull in the output constraints from its corresponding decoder context, which breaks proper layering. Instead, explicitly send the constaints on the output parameters to the filtergraph. This is similar to what is done for filtergraph inputs in 30ab4c51a180610d9f1720c75518d763515c0d9f
* | Merge commit 'ba7397baef796ca3991fe1c921bc91054407c48b'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit 'ba7397baef796ca3991fe1c921bc91054407c48b': avconv: factor out initializing stream parameters for encoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: factor out initializing stream parameters for encodingAnton Khirnov2016-06-25
| | | | | | | | | | | | | | | | | | | | Setting the filter input parameters is moved to init_input_stream(), so that it is done before the decoder is opened, potentially overwriting the information from avformat_find_stream_info() with less accurate data. This commit temporarily disables QSV transcoding with hw frames. The functionality will be re-added in the following commits.
* | ffmpeg_filter: fix hwaccel transcodingHendrik Leppkes2016-11-13
| | | | | | | | Based on a patch by Yogender Gupta <ygupta@nvidia.com>
* | vp9_mc_template: limit assert to SCALED == 0Andreas Cadhalpun2016-11-13
| | | | | | | | | | | | | | | | | | The handling of the other block sizes was limited to 'SCALED == 0' in commit dc96c0f9fc96bf4167633befc074394062793322, so this assert should be disabled, too, as it can now be triggered. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | configure: use check_lib2 for cuda and cuvidHendrik Leppkes2016-11-13
| | | | | | | | | | | | | | | | | | Fixes building for Windows x86 with MSVC using the link libraries distributed with the CUDA SDK. check_lib2 is required here because it includes the header to get the full signature of the function, including the stdcall calling convention and all of its arguments, which enables the linker to determine the fully qualified object name and resolve it through the import library, since the CUDA SDK libraries do not include un-qualified aliases.
* | avformat: Add Pro-MPEG CoP #3-R2 FEC protocolVlad Tarca2016-11-13
| | | | | | | | | | | | | | Pro-MPEG Code of Practice #3 release 2 forward error correction for rtp_mpegts streams Signed-off-by: Vlad Tarca <vtarca@mobibase.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavfi: split frame_count between input and output.Nicolas George2016-11-13
| | | | | | | | | | | | | | | | | | | | | | | | AVFilterLink.frame_count is supposed to count the number of frames that were passed on the link, but with min_samples, that number is not always the same for the source and destination filters. With the addition of a FIFO on the link, the difference will become more significant. Split the variable in two: frame_count_in counts the number of frames that entered the link, frame_count_out counts the number of frames that were sent to the destination filter.
* | fate/colorkey: disable audio stream.Nicolas George2016-11-13
| | | | | | | | | | | | | | The test is not supposed to cover audio. Also, using -vframes along with an audio stream depends on the exact order the frames are processed by filters, it is too much constraint to guarantee.
* | lavfi/ebur128: specify scaling_factor directlyMarton Balint2016-11-13
| | | | | | | | | | | | | | This should fix build with Solaris CC. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | lavf/fifo: fix undefined behaviour in deinit when destroying mutexMarton Balint2016-11-13
| | | | | | | | | | Reviewed-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: add newline to avformat_write_header error messageMarton Balint2016-11-13
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/mov: zero initialize codec_name in mov_parse_stsd_video()James Almer2016-11-12
| | | | | | | | | | | | | | Fixes valgrind warning about "Conditional jump or move depends on uninitialised value(s)" Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | fate: fix fate-api dependenciesJames Almer2016-11-12
| | | | | | | | | | | | | | No need to run the whole fate-lavf set. fate-lavf-flv_fmt is enough to create the required source file. Signed-off-by: James Almer <jamrial@gmail.com>
* | increment initial_prog_date_time when removing old segmentsRobert Nagy2016-11-12
| | | | | | | | | | | | | | | | Fixes https://trac.ffmpeg.org/ticket/5940#ticket Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>> Signed-off-by: Robert Nagy <ronag89@gmail.com> Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
* | avcodec/htmlsubtitles: Fix reading one byte beyond the arrayMichael Niedermayer2016-11-12
| | | | | | | | | | | | | | Fixes: fuzz-2-ffmpeg_SUBTITLE_AV_CODEC_ID_SUBRIP_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | pnmdec: make sure v is capped by maxvalAndreas Cadhalpun2016-11-12
| | | | | | | | | | | | | | | | Otherwise put_bits can be called with a value that doesn't fit in the sample_len, causing an assertion failure. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | pnm: limit maxval to UINT16_MAXAndreas Cadhalpun2016-11-12
| | | | | | | | | | | | | | | | From 'man ppm': The maximum color value (Maxval), again in ASCII decimal. Must be less than 65536. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | smvjpegdec: make sure cur_frame is not negativeAndreas Cadhalpun2016-11-12
| | | | | | | | | | | | | | This fixes a heap-buffer-overflow detected by AddressSanitizer. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavfi/loudnorm: add an internal libebur128 libraryMarton Balint2016-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also contains the following changes to the library: - add ff_ prefix to functions - remove cplusplus defines. - add FF_ prefix to contants and some structs - remove true peak calculation feature, since it uses its own resampler, and af_loudnorm does not need it. - remove version info and some fprintf(stderr) functions - convert to use av_malloc - always use histogram mode for LRA calculation, otherwise LRA data is slowly consuming memory making af_loudnorm unfit for 24/7 operation. It also uses a BSD style linked list implementation which is probably not available on all platforms. So let's just remove the classic mode which not uses histogram. - add ff_thread_once for calculating static histogram tables - convert some functions to void which cannot fail - remove intrinsics and some unused headers - add support for planar audio - remove channel / sample rate changer function, in ffmpeg usually we simply alloc a new context - convert some static variables to defines - declare static histogram variables as aligned - convert some initalizations to mallocz - add window size parameter to init function and remove window size setter function - convert return codes to AVERROR - fix indentation Signed-off-by: Marton Balint <cus@passwd.hu>
* | tools: add loudnorm script example to use loudnormMarton Balint2016-11-11
| | | | | | | | | | | | Based on a patch by Kyle Swanson <k@ylo.ph>. Signed-off-by: Marton Balint <cus@passwd.hu>
* | doc/encoders: sort list into alphabetical orderLou Logan2016-11-10
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | doc/encoders: add documentation for the Hap encoderTom Butterworth2016-11-10
| | | | | | | | | | | | | | | | Documents options and behaviour, noting when 'chunks' option will not be honoured. Signed-off-by: Tom Butterworth <bangnoise@gmail.com> Signed-off-by: Martin Vignali <martin.vignali@gmail.com>
* | icodec: correctly check avio_read return valueAndreas Cadhalpun2016-11-10
| | | | | | | | | | | | | | | | | | | | | | It can read less than the requested amount, in which case buf contains uninitialized data, causing problems like segmentation faults later on. Also make sure that image->size is positive, so that it can't match a negative error code. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | dvbsubdec: fix division by zero in compute_default_clutAndreas Cadhalpun2016-11-10
| | | | | | | | | | | | | | | | This problem was introduced in commit 4b90dcb8493552c17a811c8b1e6538dae4061f9d. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | proresdec_lgpl: explicitly check coff[3] against slice_data_sizeAndreas Cadhalpun2016-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | The implicit checks via v_data_size and a_data_size don't work in the case '(hdr_size > 7) && !ctx->alpha_info'. This fixes segmentation faults due to invalid reads. This problem was introduced in commit 547c2f002a87f4412a83c23b0d60364be5e7ce58. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavc/utils.c: Make sure skip_samples never goes negative.Sasi Inguva2016-11-10
| | | | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mov.c: Fallback to finding non-keyframe in fix_index, if keyframe ↵Sasi Inguva2016-11-10
| | | | | | | | | | | | | | | | search fails. Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/hap: add "compressor" option to Hap encoder to disable secondary ↵Tom Butterworth2016-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | compression The secondary compression in Hap is optional, this change exposes that option to the user as some use-cases favour higher bitrate files to reduce workload decoding. Adds "none" or "snappy" as options for "compressor". Selecting "none" disregards "chunks" option: chunking is only of benefit decompressing Snappy. Reviewed-by: Martin Vignali <martin.vignali@gmail.com> Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
* | lavc/hevc_ps: Fix an error message.Carl Eugen Hoyos2016-11-10
| |
* | lavc/hevc_ps: Use correct pix_fmt for 12bit 4:0:0.Carl Eugen Hoyos2016-11-10
| | | | | | | | Fixes part of ticket #5544.
* | avformat/flvenc: add add_keyframe_index optionSteven Liu2016-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add keyframe index metadata Used to facilitate seeking; particularly for HTTP pseudo streaming. 1. read live streaming or file by sequence 2. if use add_keyframe_index option, add a mark flag at the position, use to insert new context at the last step. 3. add the keyframes *offset* and *timestamp* into a list 4. if use add_keyframe_index option, shift the metadata data from mark flag offset 5. insert the keyframes *offset* and *timestamp* from the list by sequence 6. free the list 7. end. Add FATE test case; Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Steven Liu <liuqi@gosun.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | nut: add gray12 supportMichael Niedermayer2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Add GRAY12Luca Barbato2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | pixfmt: Add GRAY12Luca Barbato2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Add GBRAP10 outputMichael Niedermayer2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Add the GBRAP12 outputLuca Barbato2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/output: Fix alpha shift in yuv2gbrp_full_X_c()Michael Niedermayer2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/input: Fix alpha bswap for set readAlpPlanarMichael Niedermayer2016-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Drop is9_OR_10BPS() use, its name is not correctMichael Niedermayer2016-11-10
| | | | | | | | | | Found-by: Luca Barbato Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 00:54:32 +0000