ffmpeg.git
5 years agosdp: add support for H.261
Thomas Volkert [Fri, 3 Oct 2014 22:17:01 +0000 (00:17 +0200)]
sdp: add support for H.261

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq3: Dont memcpy AVFrame
Michael Niedermayer [Fri, 3 Oct 2014 22:13:26 +0000 (00:13 +0200)]
avcodec/svq3: Dont memcpy AVFrame

This avoids out of array accesses

Fixes: asan_heap-uaf_21f42e4_9_asan_heap-uaf_21f42e4_278_gl2.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/smc: fix off by 1 error
Michael Niedermayer [Fri, 3 Oct 2014 20:50:45 +0000 (22:50 +0200)]
avcodec/smc: fix off by 1 error

Fixes out of array access
Fixes: asan_heap-oob_1685bf0_5_asan_heap-oob_1f35116_430_smc.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '55f03d872640175a00bfa262da4652b7312b905f'
Michael Niedermayer [Fri, 3 Oct 2014 19:43:46 +0000 (21:43 +0200)]
Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

* commit '55f03d872640175a00bfa262da4652b7312b905f':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
doc/muxers.texi
libavformat/hlsenc.c
libavformat/version.h

See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/qpeg: fix off by 1 error in MV bounds check
Michael Niedermayer [Fri, 3 Oct 2014 19:08:52 +0000 (21:08 +0200)]
avcodec/qpeg: fix off by 1 error in MV bounds check

Fixes out of array access
Fixes: asan_heap-oob_153760f_4_asan_heap-oob_1d7a4cf_164_VWbig6.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/gifdec: factorize interleave end handling out
Michael Niedermayer [Fri, 3 Oct 2014 18:15:52 +0000 (20:15 +0200)]
avcodec/gifdec: factorize interleave end handling out

also change it to a loop
Fixes out of array access
Fixes: asan_heap-oob_ca5410_8_asan_heap-oob_ca5410_97_ID_LSD_Size_Less_Then_Data_Inter_3.gif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cinepak: fix integer underflow
Michael Niedermayer [Fri, 3 Oct 2014 17:33:01 +0000 (19:33 +0200)]
avcodec/cinepak: fix integer underflow

Fixes out of array access
Fixes: asan_heap-oob_4da0ba_6_asan_heap-oob_4da0ba_241_cvid_crash.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohlsenc: Add parameter -hls_allow_cache
Joakim Roubert [Fri, 19 Sep 2014 08:01:28 +0000 (10:01 +0200)]
hlsenc: Add parameter -hls_allow_cache

The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.

Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/pngdec: Calculate MPNG bytewidth more defensively
Michael Niedermayer [Fri, 3 Oct 2014 15:54:21 +0000 (17:54 +0200)]
avcodec/pngdec: Calculate MPNG bytewidth more defensively

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: Check bits per pixel before setting monoblack pixel format
Michael Niedermayer [Fri, 3 Oct 2014 15:35:58 +0000 (17:35 +0200)]
avcodec/pngdec: Check bits per pixel before setting monoblack pixel format

Fixes out of array accesses
Fixes: asan_heap-oob_14dbfcf_4_asan_heap-oob_1ce5767_179_add_method_small.png

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: more completely check bpp/bppcount
Michael Niedermayer [Fri, 3 Oct 2014 14:08:32 +0000 (16:08 +0200)]
avcodec/tiff: more completely check bpp/bppcount

Fixes pixel format selection
Fixes out of array accesses
Fixes: asan_heap-oob_1766029_6_asan_heap-oob_20aa045_332_cov_1823216757_m2-d1d366d7965db766c19a66c7a2ccbb6b.tif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks
Michael Niedermayer [Fri, 3 Oct 2014 12:45:04 +0000 (14:45 +0200)]
avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks

Fixes out of array access
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avformat/img2dec: reduce bmppipe probe score"
Michael Niedermayer [Fri, 3 Oct 2014 11:54:06 +0000 (13:54 +0200)]
Revert "avformat/img2dec: reduce bmppipe probe score"

This seems not needed anymore

This reverts commit 321c3cd1a97b9307760c3ebb175296590c382eca.

Found-by: carl
5 years agoavcodec/h263dec: Fix decoding messenger.h263
Michael Niedermayer [Fri, 3 Oct 2014 10:32:21 +0000 (12:32 +0200)]
avcodec/h263dec: Fix decoding messenger.h263

Fixes http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263
Fixes regression since b239f3f6

Found-by: Josh Allmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Add case for jv to avcodec_align_dimensions2()
Michael Niedermayer [Fri, 3 Oct 2014 02:30:58 +0000 (04:30 +0200)]
avcodec/utils: Add case for jv to avcodec_align_dimensions2()

Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/mlpdec: add ff_mlp_rematrix_channel_{sse4,avx2}
James Almer [Thu, 2 Oct 2014 23:38:01 +0000 (20:38 -0300)]
x86/mlpdec: add ff_mlp_rematrix_channel_{sse4,avx2}

2x to 2.5x faster than the C version.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agomlpdec: move rematrix_channels code to output_data()
James Almer [Tue, 30 Sep 2014 18:12:10 +0000 (15:12 -0300)]
mlpdec: move rematrix_channels code to output_data()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/mjpegdec: check bits per pixel for changes similar to dimensions
Michael Niedermayer [Thu, 2 Oct 2014 23:50:27 +0000 (01:50 +0200)]
avcodec/mjpegdec: check bits per pixel for changes similar to dimensions

Fixes out of array accesses
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: Check run value more completely in ls_decode_line()
Michael Niedermayer [Thu, 2 Oct 2014 21:17:21 +0000 (23:17 +0200)]
avcodec/jpeglsdec: Check run value more completely in ls_decode_line()

previously it could have been by 1 too large
Fixes out of array access
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8c1e3.jls
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8nde0.jls
Fixes: asan_heap-oob_12240fa_1_asan_heap-oob_12240fa_448_t16e3.jls

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: bump micro version for av_lockmgr_register() changes in a950edb472e8823e3483...
Michael Niedermayer [Thu, 2 Oct 2014 20:13:05 +0000 (22:13 +0200)]
avcodec: bump micro version for av_lockmgr_register() changes in a950edb472e8823e34832c7313ba447b2db76f27

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: av_lockmgr_register defines behavior on failure.
Manfred Georg [Thu, 2 Oct 2014 18:54:31 +0000 (11:54 -0700)]
avcodec/utils: av_lockmgr_register defines behavior on failure.

The register function now specifies that the user callback should
leave things in the same state that it found them on failure but
that failure to destroy is ignored by the library.  The register
function is now explicit about its behavior on failure
(it unregisters the previous callback and destroys all mutex).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec, avutil: allow more control about how samples are skipped
wm4 [Sat, 27 Sep 2014 14:47:09 +0000 (16:47 +0200)]
avcodec, avutil: allow more control about how samples are skipped

Add CODEC_FLAG2_SKIP_MANUAL (exposed as "skip_manual"), which makes
the decoder export sample skip information via side data, instead
of applying it automatically. The format of the side data is the
same as AV_PKT_DATA_SKIP_SAMPLES, but since AVPacket and AVFrame
side data constants overlap, AV_FRAME_DATA_SKIP_SAMPLES needs to
be introduced.

This is useful for applications which want to do the timestamp
calculations manually, or which actually want to retrieve the
padding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/webm_dash: some fields should go into Representation
Vignesh Venkatasubramanian [Wed, 1 Oct 2014 17:13:32 +0000 (10:13 -0700)]
lavf/webm_dash: some fields should go into Representation

Width, Height and Sample Rate should be in the AdaptationSet tag
only if all the contained representations have the same width,
height and sampling rate. Otherwise they should go into the
Representation tag. This patch adds this functionality and a fate
test for the same.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/avstring: Factor av_match_list() out
Michael Niedermayer [Tue, 30 Sep 2014 17:00:52 +0000 (19:00 +0200)]
avutil/avstring: Factor av_match_list() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix compilation of jpeg2000dsp when disabling the encoder.
Yusuke Nakamura [Thu, 2 Oct 2014 15:53:44 +0000 (12:53 -0300)]
Fix compilation of jpeg2000dsp when disabling the encoder.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavfilter: Properly check for failed format query
Derek Buitenhuis [Thu, 2 Oct 2014 10:55:52 +0000 (11:55 +0100)]
avfilter: Properly check for failed format query

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfilter/aresample: Check for memory alloc failure for out sample rates
Derek Buitenhuis [Thu, 2 Oct 2014 10:55:51 +0000 (11:55 +0100)]
avfilter/aresample: Check for memory alloc failure for out sample rates

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoSupport decoding 32bit pcm audio in mov.
Carl Eugen Hoyos [Thu, 2 Oct 2014 08:04:13 +0000 (10:04 +0200)]
Support decoding 32bit pcm audio in mov.

Such files are written by Convergent Design's Odyssey 7Q recorder.

5 years agoStop demuxing wtv on eof.
Carl Eugen Hoyos [Thu, 2 Oct 2014 07:41:57 +0000 (09:41 +0200)]
Stop demuxing wtv on eof.

Fixes ticket #3991.
Fixes ticket #3995.
Fixes ticket #3997.

Reviewed-by: Peter Ross
Reviewed-by: Paul B Mahol
5 years agoCheck for oom in the dirac parser.
Carl Eugen Hoyos [Thu, 2 Oct 2014 07:31:41 +0000 (09:31 +0200)]
Check for oom in the dirac parser.

Fixes ticket #3996.

5 years agojpeg2000: split off inverse MCT decoding as Jpeg2000DSP
James Almer [Thu, 2 Oct 2014 01:33:02 +0000 (22:33 -0300)]
jpeg2000: split off inverse MCT decoding as Jpeg2000DSP

This makes the addition of arch optimized functions easier.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavformat/mxfenc: add jpeg2000 support.
Benoit Fouet [Tue, 30 Sep 2014 12:16:52 +0000 (14:16 +0200)]
avformat/mxfenc: add jpeg2000 support.

Fixes ticket #1542

reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: fix codec_id_text check
Michael Niedermayer [Thu, 2 Oct 2014 01:57:50 +0000 (03:57 +0200)]
avformat/flvenc: fix codec_id_text check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'
Michael Niedermayer [Wed, 1 Oct 2014 19:23:42 +0000 (21:23 +0200)]
Merge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'

* commit 'd10d1b86550d254bd1e746ed613bf6885978879c':
  libx265: enable psnr reporting when requested by the user

See: 3956b12fdec5ec1b1358788a6000b78a724f76aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/webm_dash: Fix incorrect bandwidth computation
Vignesh Venkatasubramanian [Wed, 1 Oct 2014 17:13:31 +0000 (10:13 -0700)]
lavf/webm_dash: Fix incorrect bandwidth computation

Fix incorrect bandwidth computation in some cases. When the cue end
descriptor is null (i.e.) start_time_ns == -1, existing bandwidth
computed (if any) should be returned rather than returning 0.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/webm_dash: fix hardcode in cues_end computation
Vignesh Venkatasubramanian [Wed, 1 Oct 2014 17:13:30 +0000 (10:13 -0700)]
lavf/webm_dash: fix hardcode in cues_end computation

Fix an incorrect hard code in cues_end computation. Updating the fate
test reference files related to the fix as well. The earlier computation
was clearly wrong as the cues_end field was greater than the file size
itself in some cases.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/mpegvideoencdsp: improve ff_pix_sum16_sse2
James Almer [Wed, 1 Oct 2014 01:21:40 +0000 (22:21 -0300)]
x86/mpegvideoencdsp: improve ff_pix_sum16_sse2

~15% faster.

Also add an mmxext version that takes advantage of the new code, and
build it alongside with the mmx version only on x86_32.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavformat/movenc: automatically set AVC-Intra tag
Michael Niedermayer [Wed, 1 Oct 2014 14:23:48 +0000 (16:23 +0200)]
avformat/movenc: automatically set AVC-Intra tag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libx264: add avcintra-class
Michael Niedermayer [Wed, 1 Oct 2014 14:19:45 +0000 (16:19 +0200)]
avcodec/libx264: add avcintra-class

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: AVC Intra support
Michael Niedermayer [Sat, 27 Sep 2014 23:18:43 +0000 (01:18 +0200)]
avformat/movenc: AVC Intra support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: enable psnr reporting when requested by the user
Michael Niedermayer [Tue, 9 Sep 2014 23:38:58 +0000 (01:38 +0200)]
libx265: enable psnr reporting when requested by the user

This is similar to what is done in libx264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agohevc: reuse edge emu buffer for coefficients
Christophe Gisquet [Tue, 23 Sep 2014 21:36:43 +0000 (21:36 +0000)]
hevc: reuse edge emu buffer for coefficients

Kind of hackish but...

Reviewed-by: Mickael Raulet <Mickael.Raulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Force mutex to NULL after destruction.
Manfred Georg [Tue, 30 Sep 2014 22:20:42 +0000 (15:20 -0700)]
avcodec/utils: Force mutex to NULL after destruction.

A badly behaving user provided mutex manager (such as that in OpenCV) may not reset the mutex to NULL on destruction.  This can cause a problem for a later mutex manager (which may assert that the mutex is NULL before creating).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: fix avio_flush() for read streams
wm4 [Tue, 30 Sep 2014 16:46:48 +0000 (18:46 +0200)]
avformat/aviobuf: fix avio_flush() for read streams

avio_flush() did nothing useful for read streams. Fix it to behave as
expected, and discard the currently read buffer properly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: When using "-c:d copy", don't require a codec for passing the AMF...
Jeffrey Wescott [Tue, 30 Sep 2014 04:06:38 +0000 (21:06 -0700)]
avformat/flvenc: When using "-c:d copy", don't require a codec for passing the AMF metadata through from input to output.

5 years agoavcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access...
Michael Niedermayer [Tue, 30 Sep 2014 16:00:00 +0000 (18:00 +0200)]
avcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access in av_bitstream_filter_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/srtdec: use AVBPrint API
Clément Bœsch [Sun, 28 Sep 2014 09:57:46 +0000 (11:57 +0200)]
avcodec/srtdec: use AVBPrint API

5 years agoKill timed SRT
Clément Bœsch [Sun, 14 Sep 2014 18:30:27 +0000 (20:30 +0200)]
Kill timed SRT

5 years agoavcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb().
Benoit Fouet [Tue, 30 Sep 2014 11:06:30 +0000 (13:06 +0200)]
avcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.
Benoit Fouet [Mon, 29 Sep 2014 13:18:50 +0000 (15:18 +0200)]
avcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.

When only SPS or PPS is present in the stream, copy the missing one from
AVCC before insertion to the output stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRTMP: fix FD leak in rtmp_open()
Alexander Drozdov [Thu, 25 Sep 2014 22:45:08 +0000 (09:45 +1100)]
RTMP: fix FD leak in rtmp_open()

If we setup AVIO interrupt callback and it will be returns 1 on socket
timeouts and we try to connect to non-existing streams on some servers
(like nginx-rtmp) we got FD leak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation
Michael Niedermayer [Tue, 30 Sep 2014 03:11:19 +0000 (05:11 +0200)]
avcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed
Michael Niedermayer [Mon, 29 Sep 2014 03:42:59 +0000 (05:42 +0200)]
avcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed

This should reduce the memory requirement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'
Michael Niedermayer [Mon, 29 Sep 2014 19:25:09 +0000 (21:25 +0200)]
Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'

* commit '19133e96d30e3f80dbae236ef081aedef419a6bf':
  lavf: fix memleaks in avformat_find_stream_info()

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'
Michael Niedermayer [Mon, 29 Sep 2014 19:02:45 +0000 (21:02 +0200)]
Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'

* commit '2cd7c99498b1bcb450c328459cf85a686ce83456':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3a00acde05c925617dc19b5373969d864bf8414'
Michael Niedermayer [Mon, 29 Sep 2014 18:33:09 +0000 (20:33 +0200)]
Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414'

* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'
Michael Niedermayer [Mon, 29 Sep 2014 18:26:12 +0000 (20:26 +0200)]
Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'

* commit 'a05f5052fef3b3743fab7846da12861d8a8098ec':
  sdp: Make opus declaration conform to the spec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: fix memleaks in avformat_find_stream_info()
Justin Ruggles [Mon, 16 Sep 2013 19:51:46 +0000 (15:51 -0400)]
lavf: fix memleaks in avformat_find_stream_info()

When AVFMT_FLAG_NOBUFFER is set, the packets are not added to the
AVFormatContext packet list, so they need to be freed when they are
no longer needed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/put_bits: Add rebase_put_bits()
Michael Niedermayer [Mon, 29 Sep 2014 03:42:24 +0000 (05:42 +0200)]
avcodec/put_bits: Add rebase_put_bits()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: reset ret to avoid propagating minor failures
Michael Niedermayer [Sat, 27 Sep 2014 23:46:50 +0000 (00:46 +0100)]
h264: reset ret to avoid propagating minor failures

Unbreak 772d150a6e82542c06b0c251e73dd299d98d1027.

CC: libav-stable@libav.org
Bug-Id: 750 / 905753
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohevc: Initialize mergecand_list to 0
Luca Barbato [Wed, 17 Sep 2014 17:51:40 +0000 (19:51 +0200)]
hevc: Initialize mergecand_list to 0

Unbreak cf6090dc6252f2b276aa4133e3d73a89f4c6046c.

CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1

5 years agoavcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()
Michael Niedermayer [Mon, 29 Sep 2014 03:41:54 +0000 (05:41 +0200)]
avcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosdp: Make opus declaration conform to the spec
Timothy B. Terriberry [Thu, 25 Sep 2014 00:43:22 +0000 (17:43 -0700)]
sdp: Make opus declaration conform to the spec

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/hlsenc: fix outter typo
Michael Niedermayer [Sun, 28 Sep 2014 22:19:43 +0000 (00:19 +0200)]
avformat/hlsenc: fix outter typo

Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt
Michael Niedermayer [Sun, 28 Sep 2014 21:40:02 +0000 (23:40 +0200)]
avcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt

This reduces repeatly re-encoding to achieve VBV compliance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: export inner muxer timebase
Michael Niedermayer [Sun, 28 Sep 2014 20:27:33 +0000 (22:27 +0200)]
avformat/hlsenc: export inner muxer timebase

Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lls: Make unchanged function arguments const
Michael Niedermayer [Sun, 28 Sep 2014 13:44:38 +0000 (15:44 +0200)]
avutil/lls: Make unchanged function arguments const

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*
Michael Niedermayer [Sun, 28 Sep 2014 16:56:54 +0000 (18:56 +0200)]
avcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*

Fixes acodec-dca2 fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pca: Make argument of ff_pca_add() const
Michael Niedermayer [Sun, 28 Sep 2014 14:13:18 +0000 (16:13 +0200)]
avutil/pca: Make argument of ff_pca_add() const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1dec: Fixing is_intra, 2nd attempt
Michael Niedermayer [Sun, 28 Sep 2014 13:02:14 +0000 (15:02 +0200)]
avcodec/vc1dec: Fixing is_intra, 2nd attempt

This also un-does the fate changes from a52f443714b5c2a40ed272d8445f4c39220a4b69,
leaving this fix without even small differences in the output, that is
a sample for which this makes a vissible difference is very welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1dec: fix is_intra block vs. mb bug
Michael Niedermayer [Sun, 28 Sep 2014 12:00:06 +0000 (14:00 +0200)]
avcodec/vc1dec: fix is_intra block vs. mb bug

Fixes CID1194380

There are no vissible differences in the changed fate samples. Only
a tiny number of pixels change by tiny amounts in the frames i checked
If someone has a file that shows a vissible difference, please post it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: add noexecstack to linker options if supported.
Reimar Döffinger [Sun, 21 Sep 2014 08:58:10 +0000 (09:58 +0100)]
configure: add noexecstack to linker options if supported.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/libx265: enable psnr reporting when requested by the user
Michael Niedermayer [Tue, 9 Sep 2014 23:38:58 +0000 (01:38 +0200)]
avcodec/libx265: enable psnr reporting when requested by the user

This is similar to what is done in libx264.c

Fixes Ticket3567

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libx264: mark unchanged pointer arguments as const
Michael Niedermayer [Sun, 28 Sep 2014 01:40:13 +0000 (03:40 +0200)]
avcodec/libx264: mark unchanged pointer arguments as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: Added parameter -hls_allow_cache
Joakim Roubert [Mon, 22 Sep 2014 08:17:01 +0000 (10:17 +0200)]
avformat/hlsenc: Added parameter -hls_allow_cache

The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.

Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Add basic PCM audio support.
Thilo Borgmann [Tue, 23 Sep 2014 15:06:37 +0000 (17:06 +0200)]
lavd/avfoundation: Add basic PCM audio support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc_template: fix out of array read
Michael Niedermayer [Sat, 27 Sep 2014 18:34:44 +0000 (20:34 +0200)]
avcodec/ac3enc_template: fix out of array read

Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '551746680462538bb5ad7adf55fb1248190428ec'
Michael Niedermayer [Sat, 27 Sep 2014 16:21:23 +0000 (18:21 +0200)]
Merge commit '551746680462538bb5ad7adf55fb1248190428ec'

* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
configure

This is not merged as it does not work with musl here, while
our previous solution does.

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Provide a safe default for unknonw libcs
Luca Barbato [Sat, 27 Sep 2014 15:57:23 +0000 (17:57 +0200)]
configure: Provide a safe default for unknonw libcs

Support musl out of box.

Amend commit 9d2cee52d37c7340f85a5d41110282aac03e6855 that got
wrongly merged in its stead.

5 years agoavcodec/subviewerdec: remove old compat code
Clément Bœsch [Sat, 20 Sep 2014 20:30:26 +0000 (22:30 +0200)]
avcodec/subviewerdec: remove old compat code

5 years agoavcodec/microdvddec: remove old compat code
Clément Bœsch [Sat, 20 Sep 2014 20:30:11 +0000 (22:30 +0200)]
avcodec/microdvddec: remove old compat code

5 years agoavformat/assdec: make sure to free allocated data in case of error
Clément Bœsch [Sat, 27 Sep 2014 15:49:49 +0000 (17:49 +0200)]
avformat/assdec: make sure to free allocated data in case of error

5 years agoavformat/assenc: mux an event header if none are found in extradata
Clément Bœsch [Sat, 20 Sep 2014 19:37:01 +0000 (21:37 +0200)]
avformat/assenc: mux an event header if none are found in extradata

5 years agoavformat/assdec: add myself to Copyright
Clément Bœsch [Sat, 20 Sep 2014 17:31:52 +0000 (19:31 +0200)]
avformat/assdec: add myself to Copyright

5 years agoavformat/assdec: reindent after previous commit
Clément Bœsch [Sat, 20 Sep 2014 17:31:29 +0000 (19:31 +0200)]
avformat/assdec: reindent after previous commit

5 years agoavformat/assdec: make sure "Comments:" events end up in the header
Clément Bœsch [Sat, 20 Sep 2014 17:15:31 +0000 (19:15 +0200)]
avformat/assdec: make sure "Comments:" events end up in the header

5 years agoavformat/assdec: output ASS packets
Clément Bœsch [Sun, 14 Sep 2014 07:35:10 +0000 (09:35 +0200)]
avformat/assdec: output ASS packets

After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.

And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.

5 years agoavutil/x86/cpu: fix cpuid sub-leaf selection
lvqcl [Sat, 27 Sep 2014 11:21:31 +0000 (13:21 +0200)]
avutil/x86/cpu: fix cpuid sub-leaf selection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate/microsoft: add -flags +bitexact to ilaced_twomv
Michael Niedermayer [Sat, 27 Sep 2014 11:00:25 +0000 (13:00 +0200)]
tests/fate/microsoft: add -flags +bitexact to ilaced_twomv

Should fix fate failure on alpha and pre sse2 x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: remove CodingTree
Christophe Gisquet [Tue, 23 Sep 2014 21:36:41 +0000 (21:36 +0000)]
hevc: remove CodingTree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/signalstats: add more pixel formats
Paul B Mahol [Thu, 25 Sep 2014 17:25:00 +0000 (17:25 +0000)]
avfilter/signalstats: add more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoffplay: Separate AVFrame from AVSubtitle
Michael Niedermayer [Fri, 26 Sep 2014 16:11:16 +0000 (18:11 +0200)]
ffplay: Separate AVFrame from AVSubtitle

This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
Michael Niedermayer [Sat, 27 Sep 2014 01:38:12 +0000 (03:38 +0200)]
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'

* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce42316321145c435029dc288c2b5f1d48519dde'
Michael Niedermayer [Sat, 27 Sep 2014 01:16:58 +0000 (03:16 +0200)]
Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'

* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
  h264: Always invoke the get_format() callback

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
Michael Niedermayer [Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)]
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'

* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
  hwaccel: Call ->get_format again if hwaccel init fails

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'
Michael Niedermayer [Sat, 27 Sep 2014 00:12:21 +0000 (02:12 +0200)]
Merge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'

* commit '9d2cee52d37c7340f85a5d41110282aac03e6855':
  configure: Assume a standard-compliant default libc

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
could then be reverted)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
Michael Niedermayer [Fri, 26 Sep 2014 23:49:24 +0000 (01:49 +0200)]
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}
James Almer [Fri, 26 Sep 2014 23:46:41 +0000 (20:46 -0300)]
x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}

About two times faster than the c wrapper.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '883e98bc25755327565d8ae0f565a6c886f24816'
Michael Niedermayer [Fri, 26 Sep 2014 23:35:46 +0000 (01:35 +0200)]
Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'

* commit '883e98bc25755327565d8ae0f565a6c886f24816':
  probe: Bump the score for mime type matching

Conflicts:
libavformat/format.c

See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd995f0a1550c9148140eab34c7d770e90925c004'
Michael Niedermayer [Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)]
Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'

* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>