ffmpeg.git
4 years agoMakefile: add dependencies which require ffversion.h n2.4.5
Michael Niedermayer [Sat, 20 Dec 2014 03:09:01 +0000 (04:09 +0100)]
Makefile: add dependencies which require ffversion.h

Without this ffversion.h could sometimes be built too late

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4ae87554f3c8bc54db572873f5049427a7e6cb31)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUpdate for FFmpeg 2.4.5
Michael Niedermayer [Sat, 20 Dec 2014 01:51:59 +0000 (02:51 +0100)]
Update for FFmpeg 2.4.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd FFMPEG_VERSION into the binary libs
Michael Niedermayer [Fri, 19 Dec 2014 17:04:40 +0000 (18:04 +0100)]
Add FFMPEG_VERSION into the binary libs

This simplifies identifying from which revision a binary of a lib came from

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 649c158e8c94ac0cff7f03e97d6ea8bbf71b7f02)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/frame: fix malloc error path in av_frame_copy_props()
wm4 [Mon, 15 Dec 2014 03:32:58 +0000 (04:32 +0100)]
lavu/frame: fix malloc error path in av_frame_copy_props()

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a400edbb6d00c0211de38e4f1b4f593681db91d8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Do not update programs streams from program-less streams in update_wr...
Michael Niedermayer [Sun, 14 Dec 2014 18:46:31 +0000 (19:46 +0100)]
avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()

Fixes Ticket3686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Check that avio_seek() target is non negative
Michael Niedermayer [Sun, 14 Dec 2014 16:26:11 +0000 (17:26 +0100)]
avformat/aviobuf: Check that avio_seek() target is non negative

Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed86dbd05d61363dc1c0d33f3267e2177c985fdd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/soxr_resample: fix error handling
Rob Sykes [Sat, 13 Dec 2014 20:12:56 +0000 (21:12 +0100)]
swresample/soxr_resample: fix error handling

Fixes CID1257659

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4b6f2253741f3023928e61ae5105ccd4b1c515fb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: fix potential use of uninitialized variables
Michael Niedermayer [Wed, 10 Dec 2014 12:30:51 +0000 (13:30 +0100)]
avformat/flvdec: fix potential use of uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0fadbd3623cf9132832f48810c0edb93aa63f51b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskadec: fix handling of recursive SeekHead elements
wm4 [Sat, 6 Dec 2014 15:53:30 +0000 (16:53 +0100)]
avformat/matroskadec: fix handling of recursive SeekHead elements

When matroska_execute_seekhead() is called, it goes through the list of
seekhead entries and attempts to read elements not read yet. When doing
this, the parser can find further SeekHead elements, and will extend the
matroska->seekhead list. This can lead to a (practically) infinite loop
with certain broken files. (Maybe it can happen even with valid files.
The demuxer doesn't seem to check correctly whether an element has
already been read.)

Fix this by ignoring elements that were added to the seekhead field
during executing seekhead entries.

This does not fix the possible situation when multiple SeekHead elements
after the file header (i.e. occur after the "before_pos" file position)
point to the same elements. These elements will probably be parsed
multiple times, likely leading to bugs.

Fixes ticket #4162.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6551acab6877addae815decd02aeca33ba4990c8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/transcoding: check encoder before using it
Michael Niedermayer [Thu, 4 Dec 2014 17:58:38 +0000 (18:58 +0100)]
doc/examples/transcoding: check encoder before using it

Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bde27e1e617dfeb3c026f530f48a77f5ed8aa2ea)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: drop usage of coded_frame
Michael Niedermayer [Wed, 3 Dec 2014 02:06:43 +0000 (03:06 +0100)]
ffmpeg: drop usage of coded_frame

It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 242f1152bf906a4a3164a9a8e40bd52723bd5afe)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Michael Niedermayer [Wed, 3 Dec 2014 19:21:56 +0000 (20:21 +0100)]
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8524558858b7e14bc50afa10233e0194f591ab9d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rmdec: Check codec_data_size
Michael Niedermayer [Wed, 3 Dec 2014 19:01:18 +0000 (20:01 +0100)]
avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a6f730730b82645a9d31aad0968487cb77d6946c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Fix infinite loop in ff_get_line()
Michael Niedermayer [Wed, 3 Dec 2014 18:05:56 +0000 (19:05 +0100)]
avformat/aviobuf: Fix infinite loop in ff_get_line()

Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eac5c7b8377f3f0e8262ab44e5ccb2c7ed060cdd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3ea49fc5081d63277ecbc12ed440af4b02ddfdf9' into release/2.4
Michael Niedermayer [Sat, 20 Dec 2014 01:16:15 +0000 (02:16 +0100)]
Merge commit '3ea49fc5081d63277ecbc12ed440af4b02ddfdf9' into release/2.4

* commit '3ea49fc5081d63277ecbc12ed440af4b02ddfdf9':
  vc1: Do not assume seek happens after decoding

See: 6801eb0a0981f113f5f09ed4799d9ae805af62a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rsd: make tag_buf string larger
Clément Bœsch [Fri, 19 Dec 2014 23:17:43 +0000 (00:17 +0100)]
avformat/rsd: make tag_buf string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

(cherry picked from commit edbbb11488e1fce9b9703535936d2e1731e2e318)

4 years agovc1: Do not assume seek happens after decoding
Luca Barbato [Sat, 4 Oct 2014 10:40:35 +0000 (12:40 +0200)]
vc1: Do not assume seek happens after decoding

If a seek is requested before the decoding start there is no
current picture.

CC: libav-stable@libav.org
(cherry picked from commit 3e348ecfc6ab1830e43288a9e12e8f0a000afbcb)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agommvideo: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
mmvideo: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 2.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
These should be redundant, but are backported for saftey anyway
(cherry picked from commit b0273232d8fffdc8a977ccdad460b8071a0e353c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agojvdec: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
jvdec: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 8.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See: 105654e376a736d243aef4a1d121abebce912e6b
These should be redundant, but are backported for saftey anyway
(cherry picked from commit e012cb8dea7969c7b3927dbf846ef2742cd4a7ab)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/indeo3: ensure offsets are non negative
Michael Niedermayer [Thu, 18 Dec 2014 17:57:27 +0000 (18:57 +0100)]
avcodec/indeo3: ensure offsets are non negative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 368642361f3a589d7b0c23ea327d988edb434e3f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Check *log2_weight_denom
Michael Niedermayer [Thu, 18 Dec 2014 02:16:39 +0000 (03:16 +0100)]
avcodec/h264: Check *log2_weight_denom

Fixes undefined behavior
Fixes: signal_sigsegv_14768d2_2248_cov_3629497219_h264_h264___pi_20070614T182942.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61296d41e2de3b41304339e4631dd44c2e15f805)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: Check diff_cu_qp_delta_depth
Michael Niedermayer [Thu, 18 Dec 2014 01:09:23 +0000 (02:09 +0100)]
avcodec/hevc_ps: Check diff_cu_qp_delta_depth

Fixes undefined behavior
Fixes: asan_static-oob_17aa046_582_cov_1577759978_DBLK_G_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3281fa892599d71b4dc298a426af8296419cd90e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Clear delayed_pic on deallocation
Michael Niedermayer [Wed, 17 Dec 2014 20:27:37 +0000 (21:27 +0100)]
avcodec/h264: Clear delayed_pic on deallocation

Fixes use of freed memory

Fixes: case5_av_frame_copy_props.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e8714f6f93d1a32f4e4655209960afcf4c185214)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: clear filter_slice_edges() on allocation
Michael Niedermayer [Wed, 17 Dec 2014 18:42:57 +0000 (19:42 +0100)]
avcodec/hevc: clear filter_slice_edges() on allocation

This avoids use of uninitialized memory
Fixes: asan_static-oob_17aa046_582_cov_212287884_DBLK_G_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8aa8d12554868c32436750f881954193087219c8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: Check that the added xch channel isnt already there
Michael Niedermayer [Wed, 17 Dec 2014 14:33:05 +0000 (15:33 +0100)]
avcodec/dcadec: Check that the added xch channel isnt already there

Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/indeo3: use signed variables to avoid underflow
Michael Niedermayer [Wed, 17 Dec 2014 02:14:21 +0000 (03:14 +0100)]
avcodec/indeo3: use signed variables to avoid underflow

Fixes out of array read
Fixes: signal_sigsegv_1b0a4da_1865_cov_2167818389_computer_anger.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3305acdc92fa37869f160a11a87741c8a0de0454)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: make the first field of H264Context an AVClass
Michael Niedermayer [Wed, 17 Dec 2014 00:31:48 +0000 (01:31 +0100)]
avcodec/h264: make the first field of H264Context an AVClass

Fixes use of freed memory
Fixes: asan_heap-uaf_3660f67_757_cov_1257014655_Hi422FR1_SONY_A.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f3b5b139ad853b6f69c6a0b036815a60e7b3f261)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: increase yuv2rgb table headroom
Michael Niedermayer [Tue, 16 Dec 2014 21:21:21 +0000 (22:21 +0100)]
swscale: increase yuv2rgb table headroom

Fixes out of array access
Fixes: case2_bad_read_yuv2rgbx32.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: fix integer overflow of size
Michael Niedermayer [Tue, 16 Dec 2014 20:29:27 +0000 (21:29 +0100)]
avformat/mov: fix integer overflow of size

Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: check atom nesting depth
Michael Niedermayer [Tue, 16 Dec 2014 20:14:40 +0000 (21:14 +0100)]
avformat/mov: check atom nesting depth

Fixes call stack overflow
Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit caa7a3914f499f74b3ee346f26d598ebdc0ec210)

Conflicts:

libavformat/isom.h

4 years agoavcodec/utvideodec: Fix handling of slice_height=0
Michael Niedermayer [Tue, 16 Dec 2014 19:45:31 +0000 (20:45 +0100)]
avcodec/utvideodec: Fix handling of slice_height=0

Fixes out of array accesses
Fixes: asan_heap-oob_25bcd7e_3783_cov_3553517262_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3881606240953b9275a247a1c98a567f3c44890f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vmdvideo: Check len before using it in method 3
Michael Niedermayer [Tue, 16 Dec 2014 15:24:55 +0000 (16:24 +0100)]
avcodec/vmdvideo: Check len before using it in method 3

Fixes out of array access
Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3030fb7e0d41836f8add6399e9a7c7b740b48bfd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 16 Dec 2014 14:03:32 +0000 (15:03 +0100)]
avformat/flvdec: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 91ea466551c148bd897706a1b6a168e783761a06)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hdsenc: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 16 Dec 2014 14:01:05 +0000 (15:01 +0100)]
avformat/hdsenc: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 16d763fa45b95783c6770edc559769d9a83d6a10)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: create the tests directory like the doc directory
Michael Niedermayer [Mon, 15 Dec 2014 03:32:23 +0000 (04:32 +0100)]
configure: create the tests directory like the doc directory

This fixes an issue where the tests directory is not created for out of tree
builds before its needed

Tested-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e631872f13b6be0583603d45a11e53319754bc8d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4
Michael Niedermayer [Mon, 15 Dec 2014 12:43:45 +0000 (13:43 +0100)]
Merge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4

* commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: Use the mpeg12 private option scan_offset
Julien Ramseier [Sun, 14 Dec 2014 01:00:04 +0000 (02:00 +0100)]
avconv: Use the mpeg12 private option scan_offset

Introduced in aed790070486b1b01b48106310d9d0ca1730e459

Bug-Id: debian/773055
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit fd665f7f48fa7db89eb9a93ac33919f6adc40f9d)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agov4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD
Brad Smith [Mon, 20 Oct 2014 04:09:55 +0000 (00:09 -0400)]
v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 04a4fb81b3d1a92f52b5404738da8971c018946f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/motion_est: use 2x8x8 for interlaced qpel
Michael Niedermayer [Mon, 1 Dec 2014 12:23:24 +0000 (13:23 +0100)]
avcodec/motion_est: use 2x8x8 for interlaced qpel

Fixes out of array read
Fixes Ticket4121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b50e003e1cb6a215df44ffa3354603bf600b4aa3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4
Michael Niedermayer [Tue, 2 Dec 2014 11:42:38 +0000 (12:42 +0100)]
Merge commit '1cc6fef0671c5522c952671ee06bf973135a22c4' into release/2.4

* commit '1cc6fef0671c5522c952671ee06bf973135a22c4':
  Prepare for 11.1 Release

Conflicts:
RELEASE

Not merged, as our release numbers differ

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4
Michael Niedermayer [Tue, 2 Dec 2014 11:40:20 +0000 (12:40 +0100)]
Merge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4

* commit '60ccc1a748bf3d26201411479146d0798e1ecff9':
  Update changelog for v11.1

Conflicts:
Changelog

Not merged, the changelog does not match FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b31a3c6f2670d4def5aa8bd3479da9c771ab09e2' into release/2.4
Michael Niedermayer [Tue, 2 Dec 2014 10:56:29 +0000 (11:56 +0100)]
Merge commit 'b31a3c6f2670d4def5aa8bd3479da9c771ab09e2' into release/2.4

* commit 'b31a3c6f2670d4def5aa8bd3479da9c771ab09e2':
  Replace lena.pnm

Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv

See: c4abee734dcbdb589925dd6da98041dcf663ce49
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ce99ef48ea025e90351079964d63be815374f089' into release/2.4
Michael Niedermayer [Tue, 2 Dec 2014 10:40:39 +0000 (11:40 +0100)]
Merge commit 'ce99ef48ea025e90351079964d63be815374f089' into release/2.4

* commit 'ce99ef48ea025e90351079964d63be815374f089':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoPrepare for 11.1 Release
Reinhard Tartler [Tue, 2 Dec 2014 02:39:37 +0000 (21:39 -0500)]
Prepare for 11.1 Release

4 years agoUpdate changelog for v11.1
Reinhard Tartler [Tue, 2 Dec 2014 02:39:01 +0000 (21:39 -0500)]
Update changelog for v11.1

4 years agoReplace lena.pnm
Reinhard Tartler [Thu, 27 Nov 2014 17:21:03 +0000 (18:21 +0100)]
Replace lena.pnm

The new reference.pnm is a freely licensed replacement. The photo has
been taken by Reinhard Tartler on August 28 2014, and is licensed under
the expat license as stated at http://www.jclark.com/xml/copying.txt

(cherry picked from commit 8895bf7b78650c0c21c88cec0484e138ec511a4b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
4 years agoTreat all '*.pnm' files as non-text file
Reinhard Tartler [Fri, 28 Nov 2014 14:52:50 +0000 (09:52 -0500)]
Treat all '*.pnm' files as non-text file

This convinces the pre-receive hook to not consider all *.pnm files as
text files to reduce the patch sizes and avoids triggering whitespace
checks,

Contains a correction by Janne Grunau <janne-libav@jannau.net>

(cherry picked from commit 0f257e29c5520b215e573e7e3abde8e5a4743309)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
4 years agoChangelog: update for 2.4.4 n2.4.4
Michael Niedermayer [Mon, 1 Dec 2014 01:11:00 +0000 (02:11 +0100)]
Changelog: update for 2.4.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: correct license template for t2h.pm
Andreas Cadhalpun [Sun, 30 Nov 2014 22:47:36 +0000 (23:47 +0100)]
doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 928322c15f985eb965f0379fbd971d06143763aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: replace some odd 30-60 rates by higher less odd ones in get_std_framerate()
Michael Niedermayer [Fri, 21 Nov 2014 11:37:59 +0000 (12:37 +0100)]
avformat: replace some odd 30-60 rates by higher less odd ones in  get_std_framerate()

Fixes Ticket4012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 367c9d33d6dd1e8a85b63e14464e7e08ee1315cc)

Conflicts:

libavformat/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: fix yuv2yuvX_8 assembly on x86
Kieran Kunhya [Sun, 9 Nov 2014 19:39:35 +0000 (20:39 +0100)]
swscale: fix yuv2yuvX_8 assembly on x86

use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b546023b9319cbaefb638a2eeac56bdbf53d6f8b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoupdate for 2.4.4
Michael Niedermayer [Sun, 30 Nov 2014 20:59:47 +0000 (21:59 +0100)]
update for 2.4.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: Check num_long_term_ref_pics_sps
Michael Niedermayer [Fri, 28 Nov 2014 02:46:56 +0000 (03:46 +0100)]
avcodec/hevc_ps: Check num_long_term_ref_pics_sps

Fixes out of array access
Fixes: signal_sigsegv_35bd0f0_1182_cov_791726764_STRUCT_B_Samsung_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ea38e5a6b75706477898eb1e6582d667dbb9946c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Fix integer overflow in shift
Michael Niedermayer [Thu, 27 Nov 2014 18:27:05 +0000 (19:27 +0100)]
avcodec/mjpegdec: Fix integer overflow in shift

Fixes: signal_sigabrt_7ffff6ac7bb9_2683_cov_4120310995_m_ijpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 970a8f1c256f08d2f6414d573a54f2fa035c8e7a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: Check return code from pps_range_extensions()
Michael Niedermayer [Thu, 27 Nov 2014 01:31:46 +0000 (02:31 +0100)]
avcodec/hevc_ps: Check return code from pps_range_extensions()

Fixes out of array read
Fixes: asan_heap-oob_177e222_885_cov_1532528832_MERGE_D_TI_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f9440bd8122cc8798139c9370db0873a24ae14b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/rawdec: Check the return code of avpicture_get_size()
Michael Niedermayer [Wed, 26 Nov 2014 17:56:39 +0000 (18:56 +0100)]
avcodec/rawdec: Check the return code of avpicture_get_size()

Fixes out of array access
Fixes: asan_heap-oob_22388d0_3435_cov_3297128910_small_roll5_FlashCine1.cine
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d3a3b9f8907625b361420d48fe05716859620ff)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pngdec: Check IHDR/IDAT order
Michael Niedermayer [Wed, 26 Nov 2014 14:45:47 +0000 (15:45 +0100)]
avcodec/pngdec: Check IHDR/IDAT order

Fixes out of array access
Fixes: asan_heap-oob_20a6c26_2690_cov_3434532168_mail.png
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 79ceaf827be0b070675d4cd0a55c3386542defd8)

Conflicts:

libavcodec/pngdec.c

4 years agoavcodec/flacdec: Call ff_flacdsp_init() unconditionally
Michael Niedermayer [Wed, 26 Nov 2014 02:29:03 +0000 (03:29 +0100)]
avcodec/flacdec: Call ff_flacdsp_init() unconditionally

Fixes out of array access
Fixes: signal_sigsegv_324b135_3398_cov_246853371_short.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5c01ccdf5a9a330d4c51a9b9ea721fd8f1fb70b)

Conflicts:

libavcodec/flacdec.c

4 years agoavcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()
Michael Niedermayer [Tue, 25 Nov 2014 13:45:30 +0000 (14:45 +0100)]
avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()

Fixes out of array read
Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d5d95db3f5d8e2093e9e19d0c46e86f54ed2a5d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Fix context fields becoming inconsistent
Michael Niedermayer [Tue, 25 Nov 2014 12:53:06 +0000 (13:53 +0100)]
avcodec/mjpegdec: Fix context fields becoming inconsistent

Fixes out of array access
Fixes: asan_heap-oob_1ca4f85_2760_cov_144449187_miss_congeniality_pegasus_ljpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0eecf40935b22644e6cd74c586057237ecfd6844)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than 8 bits
Michael Niedermayer [Tue, 25 Nov 2014 00:14:38 +0000 (01:14 +0100)]
avcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than 8 bits

These cases are not supported yet

Fixes assertion failure
Fixes: signal_sigabrt_7ffff6ac7bb9_1_cov_1553101927_00.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0bf416f2628137e5389050fa323c329692dd4ba6)

Conflicts:

libavcodec/mjpegdec.c

4 years agoswscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()
Michael Niedermayer [Wed, 19 Nov 2014 23:43:45 +0000 (00:43 +0100)]
swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()

This avoids out of array accesses
Should fix Ticket3451

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4388e78a0f022c8572996f9ab568a39b5f716f9d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Fix some wrong versions
Michael Niedermayer [Tue, 18 Nov 2014 10:52:17 +0000 (11:52 +0100)]
doc/APIchanges: Fix some wrong versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4eae568a0712b8b59cb74b3882963f938c26eab4)

Conflicts:

doc/APIchanges

4 years agoavformat/hlsenc: Free context after hls_append_segment
Michael Niedermayer [Sun, 16 Nov 2014 03:02:56 +0000 (04:02 +0100)]
avformat/hlsenc: Free context after hls_append_segment

Fixes reading uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 530eb6acf8ee867bf00728bf7efaf505da107e17)

Conflicts:

libavformat/hlsenc.c

4 years agoavcodec/mpeg4video_parser: fix spurious extradata parse warnings
Michael Niedermayer [Sat, 15 Nov 2014 16:30:44 +0000 (17:30 +0100)]
avcodec/mpeg4video_parser: fix spurious extradata parse warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7d37e45f6bac198bc986aeb987afe219edbbd45a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavu/opt: fix av_opt_get function
Lukasz Marek [Tue, 11 Nov 2014 20:17:58 +0000 (21:17 +0100)]
lavu/opt: fix av_opt_get function

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
(cherry picked from commit 173d51c982f1ecaa8d28cd0d8611164be0c9d36d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
Michael Niedermayer [Mon, 10 Nov 2014 22:07:50 +0000 (23:07 +0100)]
avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization

Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5dcb99033df16eccc4dbbc4a099ad64457f9f090)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utvideodec: fix assumtation that slice_height >= 1
Michael Niedermayer [Mon, 10 Nov 2014 18:44:20 +0000 (19:44 +0100)]
avcodec/utvideodec: fix assumtation that slice_height >= 1

Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7656c4c6e66f8a787d384f027ad824cc1677fda1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/options_table fix min of audio channels and sample rate
Michael Niedermayer [Mon, 3 Nov 2014 12:20:24 +0000 (13:20 +0100)]
avcodec/options_table fix min of audio channels and sample rate

Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 206c98f303e833c9e94427c9e3f9867f85265f78)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/utils: Make pix_fmt desc pointer const.
Carl Eugen Hoyos [Wed, 29 Oct 2014 23:27:04 +0000 (00:27 +0100)]
lavc/utils: Make pix_fmt desc pointer const.

Fixes an "initialization discards qualifiers from pointer target type" warning.
(cherry picked from commit f05855414ed4cce97c06ba2a31f4987af47e6d4e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/threads.h: correct an include to be local
Dave Yeo [Sat, 29 Nov 2014 07:36:06 +0000 (23:36 -0800)]
libavutil/threads.h: correct an include to be local

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 32eadfe453c32788ea57968e6e80f673f434739d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/thread.h: Support OS/2 threads
Dave Yeo [Sat, 29 Nov 2014 07:34:20 +0000 (23:34 -0800)]
libavutil/thread.h: Support OS/2 threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 090a7801a8817c1fbc6db0ed39070bf82255d8f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix Makefile objects for pulseaudio support
Michael Stypa [Fri, 28 Nov 2014 14:54:50 +0000 (15:54 +0100)]
fix Makefile objects for pulseaudio support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cb58c771ade66afcc623250e1c7ac8191381d991)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ca78ee73db9e059f501706ba6108e23902e84933' into release/2.4
Michael Niedermayer [Fri, 28 Nov 2014 00:19:28 +0000 (01:19 +0100)]
Merge commit 'ca78ee73db9e059f501706ba6108e23902e84933' into release/2.4

* commit 'ca78ee73db9e059f501706ba6108e23902e84933':
  opusdec: make sure all substreams have the same number of coded samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/buffer_internal: leave the buffer pool entries volatile
Michael Niedermayer [Fri, 28 Nov 2014 00:17:56 +0000 (01:17 +0100)]
avutil/buffer_internal: leave the buffer pool entries volatile

Theres no reason to remove the volatile keyword in a release branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/buffer: use the old atomics based code for the release branch
Michael Niedermayer [Fri, 28 Nov 2014 00:01:17 +0000 (01:01 +0100)]
avutil/buffer: use the old atomics based code for the release branch

the old code worked fine for a long time and was not affected by
the bug the new code fixes and the new is not widely tested yet.
This can be reverted once the code received more testing in
master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '517ce1d09b5e6b72afc2ef9490b5f8ca42fa6a65' into release/2.4
Michael Niedermayer [Thu, 27 Nov 2014 23:57:32 +0000 (00:57 +0100)]
Merge commit '517ce1d09b5e6b72afc2ef9490b5f8ca42fa6a65' into release/2.4

* commit '517ce1d09b5e6b72afc2ef9490b5f8ca42fa6a65':
  lavu: fix memory leaks by using a mutex instead of atomics

Conflicts:
libavutil/buffer.c

The atomics code is left in place as a fallback for synchronization in the
absence of p/w32 threads. Our ABI did not requires applications to
only use threads (and matching ones) to what libavutil was build with
Our code also was not affected by the leak this change fixes, though
no question the atomics based implementation is not pretty at all.
First and foremost the code must work, being pretty comes after that.

If this causes problems, for example when libavutil is used by multiple
applications each using a different kind of threading system then the
default possibly has to be changed to the uglier atomics.

See: cea3a63ba3d89d8403eef008f7a7c54d645cff70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180' into release/2.4
Michael Niedermayer [Thu, 27 Nov 2014 23:36:23 +0000 (00:36 +0100)]
Merge commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180' into release/2.4

* commit '46a17d886b8559723c40b9f5cdf0e0c6b1c95180':
  lavu: add wrappers for the pthreads mutex API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4
Michael Niedermayer [Thu, 27 Nov 2014 23:35:35 +0000 (00:35 +0100)]
Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4

* commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554':
  mp3enc: fix a triggerable assert

Conflicts:
libavformat/mp3enc.c

No change as the faulty assert is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoopusdec: make sure all substreams have the same number of coded samples
Anton Khirnov [Mon, 24 Nov 2014 10:16:46 +0000 (11:16 +0100)]
opusdec: make sure all substreams have the same number of coded samples

Fixes invalid writes with invalid multichannel streams.

CC:libav-stable@libav.org
(cherry picked from commit 1973079417e8701b52ba810a72cb6c7c6f7f9a56)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agolavu: fix memory leaks by using a mutex instead of atomics
wm4 [Fri, 14 Nov 2014 12:34:50 +0000 (13:34 +0100)]
lavu: fix memory leaks by using a mutex instead of atomics

The buffer pool has to atomically add and remove entries from the linked
list of available buffers. This was done by removing the entire list
with a CAS operation, working on it, and then setting it back again
(using a retry-loop in case another thread was doing the same thing).

This could effectively cause memory leaks: while a thread was working on
the buffer list, other threads would allocate new buffers, increasing
the pool's total size. There was no real leak, but since these extra
buffers were not needed, but not free'd either (except when the buffer
pool was destroyed), this had the same effects as a real leak. For some
reason, growth was exponential, and could easily kill the process due
to OOM in real-world uses.

Fix this by using a mutex to protect the list operations. The fancy
way atomics remove the whole list to work on it is not needed anymore,
which also avoids the situation which was causing the leak.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit fbd6c97f9ca858140df16dd07200ea0d4bdc1a83)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agolavu: add wrappers for the pthreads mutex API
Anton Khirnov [Sun, 23 Nov 2014 20:25:05 +0000 (21:25 +0100)]
lavu: add wrappers for the pthreads mutex API

Also add no-op fallbacks when threading is disabled.

This helps keeping the code clean if Libav is compiled for targets
without threading. Since we assume that no threads of any kind are used
in such configurations, doing nothing is ok by definition.

Based on a patch by wm4 <nfxjfg@googlemail.com>.

(cherry picked from commit 2443e522f0059176ff8717c9c753eb6fe7e7bbf1)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavformat/avidec: fix handling dv in avi
Michael Niedermayer [Fri, 21 Nov 2014 02:08:20 +0000 (03:08 +0100)]
avformat/avidec: fix handling dv in avi

Fixes Ticket4086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0ae0354d3f04c369257c2a28557524d28c5df15)

4 years agoavfilter/vf_lut: gammaval709()
Peter Ross [Thu, 13 Nov 2014 22:14:24 +0000 (09:14 +1100)]
avfilter/vf_lut: gammaval709()

See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b186b7131e160d7e3ea8ef4c52745b56ddcb287b)

4 years agocinedec: report white balance gain coefficients using metadata
Peter Ross [Sun, 9 Nov 2014 01:05:41 +0000 (12:05 +1100)]
cinedec: report white balance gain coefficients using metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2093c1dc51ee1c08cb558759a1c59e6d1e3358a0)

4 years agoswscale/utils: support bayer input + scaling, and bayer input + any supported output
Michael Niedermayer [Wed, 12 Nov 2014 22:53:08 +0000 (23:53 +0100)]
swscale/utils: support bayer input + scaling, and bayer input + any supported output

Fixes Ticket4053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2f6bb86f85886a7fb36e8a10e4dd8cc3a1849377)

4 years agoswscale: support internal scaler cascades
Michael Niedermayer [Wed, 8 Oct 2014 00:05:54 +0000 (02:05 +0200)]
swscale: support internal scaler cascades

Fixes Ticket3170

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fba894615d694584057adb0ddb4d609486cad807)

Conflicts:
libswscale/version.h

4 years agoavformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code similarity
Michael Niedermayer [Wed, 19 Nov 2014 23:09:36 +0000 (00:09 +0100)]
avformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code similarity

Fixes misdetection of s16le
Fixes Ticket4109

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0dba982bb4f711447fcbb62d381d24f820c35084)

4 years agoavformat/segment: export inner muxer timebase
Michael Niedermayer [Sun, 16 Nov 2014 01:49:12 +0000 (02:49 +0100)]
avformat/segment: export inner muxer timebase

Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ce80f9fee97160049687bbbef4eb31a68166c3ee)

4 years agomp3enc: fix a triggerable assert
Anton Khirnov [Fri, 14 Nov 2014 19:20:50 +0000 (20:20 +0100)]
mp3enc: fix a triggerable assert

We have to check against the number of bytes actually needed, not the
theoretical maximum size.

4 years agoconfigure: Hack to treat x32 as x86_64.
Reimar Döffinger [Wed, 12 Nov 2014 08:53:01 +0000 (09:53 +0100)]
configure: Hack to treat x32 as x86_64.

Allows shared compilation on x32 with --disable-asm.
(cherry picked from commit 5e8e2f3861dfbc4864490401c5209fbc24df3c29)

4 years agoRevert "v4l2: setting device parameters early"
Michael Niedermayer [Sat, 8 Nov 2014 11:43:50 +0000 (12:43 +0100)]
Revert "v4l2: setting device parameters early"

This reverts commit b1ad9312331759679a9c956233716a67ae681d89.

Fixes Ticket #3517

Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f21fb793238ab6a790b94b86084148d99373ddf)

Conflicts:
libavdevice/v4l2.c

4 years agoRemove fminf() emulation.
Carl Eugen Hoyos [Sat, 8 Nov 2014 09:48:37 +0000 (10:48 +0100)]
Remove fminf() emulation.

The emulation is unused and causes compilation trouble on systems
where fminf() is defined in <math.h> but missing from libm.
This should fix compilation on Debian powerpcspe.
(cherry picked from commit 4436a8f44dedc83767b3d9da9beb85d1fae2ca30)

4 years agoavcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation
Michael Niedermayer [Wed, 5 Nov 2014 23:04:51 +0000 (00:04 +0100)]
avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation

Fixes Ticket3918

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 817663897e59f45f60016fa9d3d16e325b803967)

4 years agoUse -fno-optimize-sibling-calls on parisc also for gcc 4.9.
Carl Eugen Hoyos [Wed, 5 Nov 2014 00:35:48 +0000 (01:35 +0100)]
Use -fno-optimize-sibling-calls on parisc also for gcc 4.9.

Fixes fate on hppa.
Found-by: Andreas Cadhalpun.
(cherry picked from commit f2ffaae9ac93e221a0e1e11ea3581422323abd2f)

4 years agoavcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes
Michael Niedermayer [Tue, 16 Sep 2014 01:57:00 +0000 (03:57 +0200)]
avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes

reduces noise for tserrors.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 688a40b4ed7d2e07d3f96c2feecf785a4866e60c)

4 years agoffmpeg_opt: store canvas size in decoder context
Michael Niedermayer [Tue, 4 Nov 2014 19:19:04 +0000 (20:19 +0100)]
ffmpeg_opt: store canvas size in decoder context

Fixes canvas size
Fixes Ticket4074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 66b9e60af0b82ee8bd63d84011127dca4ea1e23f)

4 years agoavcodec/mpeg12dec: do not trust AVCodecContext input dimensions
Michael Niedermayer [Wed, 5 Nov 2014 00:21:59 +0000 (01:21 +0100)]
avcodec/mpeg12dec: do not trust AVCodecContext input dimensions

Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77f1199e8fd9a289ad64eb2bb5bd4deeda8bccb8)

4 years agoavcodec/h264_slice: Clear table pointers to avoid stale pointers n2.4.3
Michael Niedermayer [Sun, 2 Nov 2014 00:55:40 +0000 (01:55 +0100)]
avcodec/h264_slice: Clear table pointers to avoid stale pointers

Might fix Ticket3889

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 547fce95858ef83f8c25ae347e3ae3b8ba437fd9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c
Michael Niedermayer [Mon, 27 Oct 2014 03:30:11 +0000 (04:30 +0100)]
avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c

Fixes Ticket4011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 69a9a90d2ef795162074be24e3ad2182a8676af2)

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