ffmpeg.git
2 years agolavfi/ebur128: specify scaling_factor directly
Marton Balint [Sun, 13 Nov 2016 01:32:09 +0000 (02:32 +0100)]
lavfi/ebur128: specify scaling_factor directly

This should fix build with Solaris CC.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agolavf/fifo: fix undefined behaviour in deinit when destroying mutex
Marton Balint [Sat, 12 Nov 2016 01:07:24 +0000 (02:07 +0100)]
lavf/fifo: fix undefined behaviour in deinit when destroying mutex

Reviewed-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoffmpeg: add newline to avformat_write_header error message
Marton Balint [Sat, 12 Nov 2016 00:38:25 +0000 (01:38 +0100)]
ffmpeg: add newline to avformat_write_header error message

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavformat/mov: zero initialize codec_name in mov_parse_stsd_video()
James Almer [Sat, 12 Nov 2016 23:52:22 +0000 (20:52 -0300)]
avformat/mov: zero initialize codec_name in mov_parse_stsd_video()

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>
2 years agofate: fix fate-api dependencies
James Almer [Sat, 12 Nov 2016 23:09:00 +0000 (20:09 -0300)]
fate: fix fate-api dependencies

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>
2 years agoincrement initial_prog_date_time when removing old segments
Robert Nagy [Fri, 11 Nov 2016 13:56:00 +0000 (21:56 +0800)]
increment initial_prog_date_time when removing old segments

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>
2 years agoavcodec/htmlsubtitles: Fix reading one byte beyond the array
Michael Niedermayer [Fri, 11 Nov 2016 01:25:42 +0000 (02:25 +0100)]
avcodec/htmlsubtitles: Fix reading one byte beyond the array

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>
2 years agopnmdec: make sure v is capped by maxval
Andreas Cadhalpun [Wed, 9 Nov 2016 00:09:35 +0000 (01:09 +0100)]
pnmdec: make sure v is capped by maxval

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>
2 years agopnm: limit maxval to UINT16_MAX
Andreas Cadhalpun [Thu, 10 Nov 2016 19:31:02 +0000 (20:31 +0100)]
pnm: limit maxval to UINT16_MAX

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>
2 years agosmvjpegdec: make sure cur_frame is not negative
Andreas Cadhalpun [Thu, 10 Nov 2016 21:09:03 +0000 (22:09 +0100)]
smvjpegdec: make sure cur_frame is not negative

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>
2 years agolavfi/loudnorm: add an internal libebur128 library
Marton Balint [Sat, 15 Oct 2016 17:21:22 +0000 (19:21 +0200)]
lavfi/loudnorm: add an internal libebur128 library

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>
2 years agotools: add loudnorm script example to use loudnorm
Marton Balint [Sun, 23 Oct 2016 21:36:37 +0000 (23:36 +0200)]
tools: add loudnorm script example to use loudnorm

Based on a patch by Kyle Swanson <k@ylo.ph>.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agodoc/encoders: sort list into alphabetical order
Lou Logan [Thu, 10 Nov 2016 23:41:37 +0000 (14:41 -0900)]
doc/encoders: sort list into alphabetical order

Signed-off-by: Lou Logan <lou@lrcd.com>
2 years agodoc/encoders: add documentation for the Hap encoder
Tom Butterworth [Thu, 10 Nov 2016 14:41:27 +0000 (14:41 +0000)]
doc/encoders: add documentation for the Hap encoder

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>
2 years agoicodec: correctly check avio_read return value
Andreas Cadhalpun [Tue, 8 Nov 2016 22:29:28 +0000 (23:29 +0100)]
icodec: correctly check avio_read return value

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>
2 years agodvbsubdec: fix division by zero in compute_default_clut
Andreas Cadhalpun [Tue, 8 Nov 2016 21:32:42 +0000 (22:32 +0100)]
dvbsubdec: fix division by zero in compute_default_clut

This problem was introduced in commit
4b90dcb8493552c17a811c8b1e6538dae4061f9d.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoproresdec_lgpl: explicitly check coff[3] against slice_data_size
Andreas Cadhalpun [Wed, 9 Nov 2016 22:49:46 +0000 (23:49 +0100)]
proresdec_lgpl: explicitly check coff[3] against slice_data_size

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>
2 years agolavc/utils.c: Make sure skip_samples never goes negative.
Sasi Inguva [Fri, 4 Nov 2016 22:31:58 +0000 (15:31 -0700)]
lavc/utils.c: Make sure skip_samples never goes negative.

Signed-off-by: Sasi Inguva <isasi@google.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/mov.c: Fallback to finding non-keyframe in fix_index, if keyframe search fails.
Sasi Inguva [Wed, 9 Nov 2016 18:51:13 +0000 (10:51 -0800)]
lavf/mov.c: Fallback to finding non-keyframe in fix_index, if keyframe 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>
2 years agoavcodec/hap: add "compressor" option to Hap encoder to disable secondary compression
Tom Butterworth [Mon, 7 Nov 2016 23:58:48 +0000 (23:58 +0000)]
avcodec/hap: add "compressor" option to Hap encoder to disable secondary 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>
2 years agolavc/hevc_ps: Fix an error message.
Carl Eugen Hoyos [Thu, 10 Nov 2016 07:22:26 +0000 (08:22 +0100)]
lavc/hevc_ps: Fix an error message.

2 years agolavc/hevc_ps: Use correct pix_fmt for 12bit 4:0:0.
Carl Eugen Hoyos [Thu, 10 Nov 2016 07:11:12 +0000 (08:11 +0100)]
lavc/hevc_ps: Use correct pix_fmt for 12bit 4:0:0.

Fixes part of ticket #5544.

2 years agoavformat/flvenc: add add_keyframe_index option
Steven Liu [Tue, 8 Nov 2016 11:27:21 +0000 (19:27 +0800)]
avformat/flvenc: add add_keyframe_index option

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>
2 years agonut: add gray12 support
Michael Niedermayer [Thu, 10 Nov 2016 00:05:42 +0000 (01:05 +0100)]
nut: add gray12 support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale: Add GRAY12
Luca Barbato [Thu, 3 Nov 2016 15:10:03 +0000 (16:10 +0100)]
swscale: Add GRAY12

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agopixfmt: Add GRAY12
Luca Barbato [Thu, 3 Nov 2016 15:03:54 +0000 (16:03 +0100)]
pixfmt: Add GRAY12

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale: Add GBRAP10 output
Michael Niedermayer [Wed, 9 Nov 2016 23:02:50 +0000 (00:02 +0100)]
swscale: Add GBRAP10 output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale: Add the GBRAP12 output
Luca Barbato [Wed, 12 Oct 2016 19:30:34 +0000 (21:30 +0200)]
swscale: Add the GBRAP12 output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale/output: Fix alpha shift in yuv2gbrp_full_X_c()
Michael Niedermayer [Wed, 9 Nov 2016 22:53:43 +0000 (23:53 +0100)]
swscale/output: Fix alpha shift in yuv2gbrp_full_X_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale/input: Fix alpha bswap for set readAlpPlanar
Michael Niedermayer [Wed, 9 Nov 2016 22:37:29 +0000 (23:37 +0100)]
swscale/input: Fix alpha bswap for set readAlpPlanar

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoswscale: Drop is9_OR_10BPS() use, its name is not correct
Michael Niedermayer [Wed, 9 Nov 2016 19:45:33 +0000 (20:45 +0100)]
swscale: Drop is9_OR_10BPS() use, its name is not correct

Found-by: Luca Barbato
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoescape124: reject codebook size 0
Andreas Cadhalpun [Tue, 8 Nov 2016 23:38:50 +0000 (00:38 +0100)]
escape124: reject codebook size 0

It causes a cb_depth of 32, leading to assertion failures in get_bits.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoicodec: add ico_read_close to fix leaking ico->images
Andreas Cadhalpun [Tue, 8 Nov 2016 22:54:41 +0000 (23:54 +0100)]
icodec: add ico_read_close to fix leaking ico->images

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoicodec: fix leaking pkt on error
Andreas Cadhalpun [Tue, 8 Nov 2016 22:53:52 +0000 (23:53 +0100)]
icodec: fix leaking pkt on error

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoMAINTAINERS: Add myself to flvenc
Steven Liu [Wed, 9 Nov 2016 00:36:02 +0000 (08:36 +0800)]
MAINTAINERS: Add myself to flvenc

Signed-off-by: Steven Liu <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agompegts: prevent division by zero
Andreas Cadhalpun [Mon, 7 Nov 2016 22:37:59 +0000 (23:37 +0100)]
mpegts: prevent division by zero

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agomatroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header
Andreas Cadhalpun [Mon, 7 Nov 2016 23:42:23 +0000 (00:42 +0100)]
matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoavcodec/hap: pass texture-compression destination as argument, not in context
Tom Butterworth [Mon, 7 Nov 2016 16:25:33 +0000 (16:25 +0000)]
avcodec/hap: pass texture-compression destination as argument, not in context

This allows a subsequent change to compress directly into the output packet when possible.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
2 years agoavformat/matroskadec: fix DiscardPadding element parsing
James Almer [Sat, 5 Nov 2016 20:46:52 +0000 (17:46 -0300)]
avformat/matroskadec: fix DiscardPadding element parsing

If the value is negative then it means padding at the start of the packet
instead of at the end.

Based on a patch by Hendrik Leppkes.

Reviewed-by: James Zern <jzern-at-google.com@ffmpeg.org>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoopus: move the entropy decoding functions to opus_rc.c
Rostislav Pehlivanov [Mon, 7 Nov 2016 22:33:11 +0000 (22:33 +0000)]
opus: move the entropy decoding functions to opus_rc.c

The intention is to have both encoding and decoding functions
in opus_rc.c.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoopus: move all tables to a separate file
Rostislav Pehlivanov [Mon, 7 Nov 2016 21:48:16 +0000 (21:48 +0000)]
opus: move all tables to a separate file

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoavformat/mov: Read multiple stsd from DV
Vittorio Giovara [Tue, 8 Nov 2016 03:32:05 +0000 (22:32 -0500)]
avformat/mov: Read multiple stsd from DV

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: use AVStream.codecpar in open_input_stream()
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 09:34:58 +0000 (01:34 -0800)]
ffserver: use AVStream.codecpar in open_input_stream()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: user AVStream.codecpar in compute_status()
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 09:07:14 +0000 (01:07 -0800)]
ffserver: user AVStream.codecpar in compute_status()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: use AVStream.codecpar in find_stream_in_feed()
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 08:58:25 +0000 (00:58 -0800)]
ffserver: use AVStream.codecpar in find_stream_in_feed()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: get time_base from AVStream in print_stream_params()
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 08:51:28 +0000 (00:51 -0800)]
ffserver: get time_base from AVStream in print_stream_params()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: use .codecpar instead of .codec in print_stream_params()
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 08:49:43 +0000 (00:49 -0800)]
ffserver: use .codecpar instead of .codec in print_stream_params()

AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: check for codec match using AVStream.codecpar
Reynaldo H. Verdejo Pinochet [Tue, 8 Nov 2016 00:24:32 +0000 (16:24 -0800)]
ffserver: check for codec match using AVStream.codecpar

Compare using AVCodecParameters instead of the deprecated
AVStream.codec field

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agocmdutils: add show_demuxers and show_muxers
Steven Liu [Fri, 4 Nov 2016 12:20:25 +0000 (20:20 +0800)]
cmdutils: add show_demuxers and show_muxers

add -muxers and -demuxers parameters to list the dexmuers and muxers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoaacenc: quit when the audio queue reaches 0 rather than keeping track of empty frames
Rostislav Pehlivanov [Mon, 7 Nov 2016 02:11:50 +0000 (02:11 +0000)]
aacenc: quit when the audio queue reaches 0 rather than keeping track of empty frames

The libopus encoder does the same thing and its better than
keeping track of when the empty flush frames appear.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoffserver: Fix one AVFormatContext misuse
Michael Niedermayer [Mon, 7 Nov 2016 17:42:50 +0000 (18:42 +0100)]
ffserver: Fix one AVFormatContext misuse

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agohls: fix leaking avio_opts on hls_read_header error
Andreas Cadhalpun [Mon, 7 Nov 2016 18:43:16 +0000 (19:43 +0100)]
hls: fix leaking avio_opts on hls_read_header error

Use the hls_close function to reduce code duplication.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agohls: move hls_close above hls_read_header
Andreas Cadhalpun [Sun, 6 Nov 2016 23:09:54 +0000 (00:09 +0100)]
hls: move hls_close above hls_read_header

This is needed for the following commit.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agompegaudio_parser: don't return AVERROR_PATCHWELCOME
Andreas Cadhalpun [Mon, 7 Nov 2016 00:16:14 +0000 (01:16 +0100)]
mpegaudio_parser: don't return AVERROR_PATCHWELCOME

The API does not allow returning AVERROR codes.

It triggers an assert in av_parser_parse2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoffserver: steal SPACE_CHARS, remove one reason for internal.h that way
Michael Niedermayer [Fri, 28 Oct 2016 17:28:39 +0000 (19:28 +0200)]
ffserver: steal SPACE_CHARS, remove one reason for internal.h that way

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: eliminate hardcoded literal and duplicated array size
Michael Niedermayer [Fri, 28 Oct 2016 17:21:21 +0000 (19:21 +0200)]
ffserver: eliminate hardcoded literal and duplicated array size

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: use av_freep() for a case that is not clearly at the end of a function
Michael Niedermayer [Fri, 28 Oct 2016 17:16:48 +0000 (19:16 +0200)]
ffserver: use av_freep() for a case that is not clearly at the end of a function

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: Throw ffm.h out its not used except for a constant that is part of the...
Michael Niedermayer [Fri, 28 Oct 2016 16:36:53 +0000 (18:36 +0200)]
ffserver: Throw ffm.h out its not used except for a constant that is part of the format

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffserver: drop a bunch of apparently unneeded internal headers
Michael Niedermayer [Fri, 28 Oct 2016 16:32:36 +0000 (18:32 +0200)]
ffserver: drop a bunch of apparently unneeded internal headers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/hls: Add missing error check for avcodec_parameters_copy()
Anssi Hannula [Sun, 6 Nov 2016 21:23:20 +0000 (23:23 +0200)]
avformat/hls: Add missing error check for avcodec_parameters_copy()

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2 years agoavformat/hls: Fix probing mpegts audio streams that use probing
Anssi Hannula [Sat, 5 Nov 2016 16:05:31 +0000 (18:05 +0200)]
avformat/hls: Fix probing mpegts audio streams that use probing

Commit 04964ac311abe670f ("avformat/hls: Fix missing streams in some
cases with MPEG TS") caused a regression where subdemuxer streams that
use probing (e.g. dts/eac3/mp2 in mpegts) no longer get probed properly.

This is because the codec parameters from the subdemuxer stream, once
probed, are not passed on to the main stream.

Fix that by updating the codec parameters if the codec id changes.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2 years agoavformat/hls: Factor copying stream info to a separate function
Anssi Hannula [Sat, 5 Nov 2016 16:04:00 +0000 (18:04 +0200)]
avformat/hls: Factor copying stream info to a separate function

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2 years agoxmv: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:25:15 +0000 (17:25 +0200)]
xmv: validate sample_rate

AVCodecParameters.sample_rate is a signed integer, so
XMVAudioPacket.sample_rate should be, too.

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agovoc_packet: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:19:20 +0000 (17:19 +0200)]
voc_packet: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agooggparsespeex: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:12:49 +0000 (17:12 +0200)]
oggparsespeex: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agonuv: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:08:51 +0000 (17:08 +0200)]
nuv: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agomvdec: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:06:45 +0000 (17:06 +0200)]
mvdec: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agompeg4audio: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 15:03:04 +0000 (17:03 +0200)]
mpeg4audio: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Also check for errors from avpriv_mpeg4audio_get_config in
ff_mp4_read_dec_config_descr.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agomov: validate sidx timescale
Andreas Cadhalpun [Sun, 23 Oct 2016 14:48:01 +0000 (16:48 +0200)]
mov: validate sidx timescale

A negative timescale doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agomov: validate time_scale
Andreas Cadhalpun [Sun, 23 Oct 2016 14:38:52 +0000 (16:38 +0200)]
mov: validate time_scale

A negative timescale doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agomov: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 14:23:55 +0000 (16:23 +0200)]
mov: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

fate-aac-al07_96 fails if sample_rate == 0 is rejected in
ff_mov_read_stsd_entries.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoffmdec: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 14:05:01 +0000 (16:05 +0200)]
ffmdec: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agobfi: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 13:54:01 +0000 (15:54 +0200)]
bfi: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoadxdec: validate sample_rate
Andreas Cadhalpun [Sun, 23 Oct 2016 13:47:40 +0000 (15:47 +0200)]
adxdec: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoavfilter/vf_drawtext: fixed default/flt formatting ignoring offset parameter
Alex Agranovsky [Mon, 26 Sep 2016 20:23:45 +0000 (16:23 -0400)]
avfilter/vf_drawtext: fixed default/flt formatting ignoring offset parameter

Signed-off-by: Alex Agranovsky <alex@sighthound.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/flvenc: support mp3 audio with 48khz
fuqiuping [Wed, 28 Sep 2016 14:47:47 +0000 (07:47 -0700)]
avformat/flvenc: support mp3 audio with 48khz

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/tcp: Put struct sockaddr_in6 under #if
Michael Niedermayer [Sun, 6 Nov 2016 20:10:24 +0000 (21:10 +0100)]
avformat/tcp: Put struct sockaddr_in6 under #if

Fixes: error: dereferencing pointer to incomplete type

Tested-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/af_volumedetect: Remove dependency on channel layout
Michael Niedermayer [Mon, 5 Sep 2016 19:42:31 +0000 (21:42 +0200)]
avfilter/af_volumedetect: Remove dependency on channel layout

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg: parameters for filter thread counts
DeHackEd [Sun, 30 Oct 2016 13:25:39 +0000 (09:25 -0400)]
ffmpeg: parameters for filter thread counts

Enables specifying how many threads are available to each filtergraph.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/libx26[45]: Add documentation for forced-idr
Derek Buitenhuis [Sun, 6 Nov 2016 13:46:30 +0000 (13:46 +0000)]
doc/libx26[45]: Add documentation for forced-idr

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/mpegtsenc: write metadata descriptor for timed ID3 packets
Stefano Sabatini [Tue, 12 Apr 2016 16:16:21 +0000 (18:16 +0200)]
lavf/mpegtsenc: write metadata descriptor for timed ID3 packets

This is required since some programs are not able to correctly recognize
the metadata. See H.222, 2.6.58 Metadata pointer descriptor.

putstr8() is modified in order to allow to skip writing the string
length.

2 years agolavf/mpegtsenc: move putstr8 definition up
Stefano Sabatini [Tue, 12 Apr 2016 16:14:45 +0000 (18:14 +0200)]
lavf/mpegtsenc: move putstr8 definition up

This allows to use the function in a future commit.

2 years agoavformat/mux: remove unnecessary autobsf hack
James Almer [Fri, 23 Sep 2016 05:02:43 +0000 (02:02 -0300)]
avformat/mux: remove unnecessary autobsf hack

autobsf has been ported to the new bsf API.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/framehash: also print channel layout as a string
James Almer [Wed, 28 Sep 2016 23:55:18 +0000 (20:55 -0300)]
avformat/framehash: also print channel layout as a string

This should be more useful for users since numerical values for channel
layout can be confusing and unintuitive.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMAINTAINERS: Replace QSV maintainer
Michael Niedermayer [Sat, 5 Nov 2016 18:38:15 +0000 (19:38 +0100)]
MAINTAINERS: Replace QSV maintainer

Ivan has a shortage of time to take care of QSV, Mark agreed to take over.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavutil/softfloat_ieee754: make all functions inline
James Almer [Fri, 16 Sep 2016 02:05:29 +0000 (23:05 -0300)]
avutil/softfloat_ieee754: make all functions inline

Removes "defined but not used" warnings

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agomxfdec: fix NULL pointer dereference
Andreas Cadhalpun [Fri, 4 Nov 2016 23:17:53 +0000 (00:17 +0100)]
mxfdec: fix NULL pointer dereference

Metadata streams have priv_data set to NULL.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agolzf: update pointer p after realloc
Andreas Cadhalpun [Fri, 4 Nov 2016 21:58:49 +0000 (22:58 +0100)]
lzf: update pointer p after realloc

This fixes heap-use-after-free detected by AddressSanitizer.

Reviewed-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 years agoavformat/tcp: workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4...
liu jc [Wed, 24 Aug 2016 10:46:41 +0000 (10:46 +0000)]
avformat/tcp: workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number.

Signed-off-by: liujingchao <jcliu@outlook.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/rtpdec: Add support for 24 bit RTSP audio playback
Timur Aydin [Fri, 4 Nov 2016 22:15:44 +0000 (01:15 +0300)]
avformat/rtpdec: Add support for 24 bit RTSP audio playback

When ffplay is used to play from the RTSP URL that serves 24 bit audio
content, ffplay fails to recognize the audio codec format. The attached
patch adds support for playing 24 bit audio content over RTSP by
defining a dynamic payload handler for "L24".

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agofate: Remove show_formats for fate-mov-zombie test
Michael Niedermayer [Sat, 5 Nov 2016 14:25:44 +0000 (15:25 +0100)]
fate: Remove show_formats for fate-mov-zombie test

This includes the absolute path

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agofate: add zombie test
Michael Niedermayer [Sat, 5 Nov 2016 00:36:53 +0000 (01:36 +0100)]
fate: add zombie test

This test tests some odd sample with odd aspect ratio

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/nvenc.c: Use new safe dlopen code.
Matt Oliver [Sat, 29 Oct 2016 07:25:36 +0000 (18:25 +1100)]
avcodec/nvenc.c: Use new safe dlopen code.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2 years agoavformat/avisynth.c: Use new safe dlopen code.
Matt Oliver [Mon, 31 Oct 2016 03:30:43 +0000 (14:30 +1100)]
avformat/avisynth.c: Use new safe dlopen code.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2 years agoavutil/hwcontext_dxva.c: Use new safe dlopen code.
Matt Oliver [Sat, 29 Oct 2016 07:25:05 +0000 (18:25 +1100)]
avutil/hwcontext_dxva.c: Use new safe dlopen code.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2 years agocompat/w32dlfcn.h: Add safe win32 dlopen/dlclose/dlsym functions.
Matt Oliver [Sat, 29 Oct 2016 13:08:41 +0000 (00:08 +1100)]
compat/w32dlfcn.h: Add safe win32 dlopen/dlclose/dlsym functions.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2 years agoffmpeg: don't overwrite av_bsf_receive_packet return value before checking it
James Almer [Sat, 5 Nov 2016 03:04:27 +0000 (00:04 -0300)]
ffmpeg: don't overwrite av_bsf_receive_packet return value before checking it

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/rawdec: check for side data before checking its size
James Almer [Fri, 4 Nov 2016 01:34:58 +0000 (22:34 -0300)]
avcodec/rawdec: check for side data before checking its size

Fixes valgrind warnings about usage of uninitialized values.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agofate: add bsf tests for ticket 5927
James Almer [Fri, 4 Nov 2016 20:38:53 +0000 (17:38 -0300)]
fate: add bsf tests for ticket 5927

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/mux: split side data before internal auto BSF
Michael Niedermayer [Fri, 4 Nov 2016 12:43:45 +0000 (13:43 +0100)]
avformat/mux: split side data before internal auto BSF

The bitstream filters do not work with merged in side data

This leaves the input packet split if it is being split.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>