ffmpeg.git
2 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>
2 years agodoc/filters: fix typos and spelling errors
Lou Logan [Tue, 16 Dec 2014 19:32:00 +0000 (10:32 -0900)]
doc/filters: fix typos and spelling errors

Prompted-by: Carl Oxwall <@oxwall>
Signed-off-by: Lou Logan <lou@lrcd.com>
2 years agoavcodec/xface: Add asserts to limit nb_words from becoming too large
Michael Niedermayer [Tue, 16 Dec 2014 17:09:16 +0000 (18:09 +0100)]
avcodec/xface: Add asserts to limit nb_words from becoming too large

Approved-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/xface: correct the XFACE_MAX_* values
Michael Niedermayer [Tue, 16 Dec 2014 17:57:54 +0000 (18:57 +0100)]
avcodec/xface: correct the XFACE_MAX_* values

Fixes out of array access

Fixes: asan_stack-oob_32c12e5_2536_cov_2442316831_lena.xface
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 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>
2 years agoavformat/hlsenc: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 16 Dec 2014 14:04:41 +0000 (15:04 +0100)]
avformat/hlsenc: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 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>
2 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>
2 years agolavfi: add colorlevels filter
Paul B Mahol [Sat, 6 Dec 2014 14:04:38 +0000 (14:04 +0000)]
lavfi: add colorlevels filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat/hlsenc: fix hls_write_trailer() on hls_start() failure
Christian Suloway [Tue, 16 Dec 2014 00:10:46 +0000 (18:10 -0600)]
avformat/hlsenc: fix hls_write_trailer() on hls_start() failure

Close segment I/O context and append segment in hls_write_trailer() only
when segment I/O context is allocated.

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agosnow_dwt: Don't try and free members of non-existent arrays
Derek Buitenhuis [Mon, 15 Dec 2014 22:59:08 +0000 (17:59 -0500)]
snow_dwt: Don't try and free members of non-existent arrays

If allocation fails earlier on, and the next frame is processed,
the slice buffer could be left in a state where line and data_stack
have already been freed, or are otherwise null pointers.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2 years agovp9/x86: save one register on 32bit idct32x32.
Ronald S. Bultje [Tue, 16 Dec 2014 01:40:48 +0000 (20:40 -0500)]
vp9/x86: save one register on 32bit idct32x32.

Fixes build on win32.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40'
Michael Niedermayer [Tue, 16 Dec 2014 01:23:43 +0000 (02:23 +0100)]
Merge commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40'

* commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40':
  mov: Fix handling of zero-length metadata values

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoffmpeg: Check for subtitle_out malloc failure
Michael Niedermayer [Mon, 15 Dec 2014 22:26:54 +0000 (23:26 +0100)]
ffmpeg: Check for subtitle_out malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/tiffenc: Consistently use ADD_ENTRY1()
Michael Niedermayer [Mon, 15 Dec 2014 21:45:41 +0000 (22:45 +0100)]
avcodec/tiffenc: Consistently use ADD_ENTRY1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agomov: Fix handling of zero-length metadata values
Martin Storsjö [Mon, 15 Dec 2014 10:09:10 +0000 (12:09 +0200)]
mov: Fix handling of zero-length metadata values

Since 3cec81f4d4, a zero-length metadata value would try to
allocate 2*0 bytes, where av_malloc() returns NULL.

Always add one to the allocated length, to allow space for
a null terminator in the zero-length case.

Incidentally, this fixes fate-alac on RVCT 4.0, where a compiler
bug seems to mess up the mov muxer to the point that it writes
the wrong sort of metadata. Previously this bug was undetected,
but since 3cec81f4d4 such mov files started returning
AVERROR(ENOMEM) in the mov demuxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoMerge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'
Michael Niedermayer [Mon, 15 Dec 2014 21:12:40 +0000 (22:12 +0100)]
Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'

* commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0':
  tiff: set the correct return value when check_size() fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'
Michael Niedermayer [Mon, 15 Dec 2014 21:00:32 +0000 (22:00 +0100)]
Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'

* commit '3c27275c1309190f2d6ed69140b67d014215b6c9':
  tiff: Check the check_size() return value and forward it

Conflicts:
libavcodec/tiffenc.c

See: d50aa006fb3430bedc3872ba10e028a714499625
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b'
Michael Niedermayer [Mon, 15 Dec 2014 20:35:43 +0000 (21:35 +0100)]
Merge commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b'

* commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b':
  prores: Evaluate all the quantizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '490a3ebf36821b81f73e34ad3f554cb523dd2682'
Michael Niedermayer [Mon, 15 Dec 2014 20:34:15 +0000 (21:34 +0100)]
Merge commit '490a3ebf36821b81f73e34ad3f554cb523dd2682'

* commit '490a3ebf36821b81f73e34ad3f554cb523dd2682':
  matroskadec: Fix read-after-free in matroska_read_seek()

See: 33301f001747d7a542073c634cc81da5eff051cf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'
Michael Niedermayer [Mon, 15 Dec 2014 20:27:05 +0000 (21:27 +0100)]
Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'

* commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1':
  mpegvideo: move REBASE_PICTURE where it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'
Michael Niedermayer [Mon, 15 Dec 2014 20:19:29 +0000 (21:19 +0100)]
Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'

* commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8':
  mpegvideo: remove unused function declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/hevc: Print an error if luma_log2_weight_denom is out of range
Michael Niedermayer [Mon, 15 Dec 2014 20:10:23 +0000 (21:10 +0100)]
avcodec/hevc: Print an error if luma_log2_weight_denom is out of range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa'
Michael Niedermayer [Mon, 15 Dec 2014 20:03:49 +0000 (21:03 +0100)]
Merge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa'

* commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa':
  hevc: always clip luma_log2_weight_denom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agolavf/concatdec: handle NOPTS start_time.
Nicolas George [Mon, 15 Dec 2014 17:42:41 +0000 (18:42 +0100)]
lavf/concatdec: handle NOPTS start_time.

Fix trac ticket #3598.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoChangelog: Add 10bit spp
Michael Niedermayer [Mon, 15 Dec 2014 17:59:13 +0000 (18:59 +0100)]
Changelog: Add 10bit spp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_spp: support 10bit per sample
Michael Niedermayer [Fri, 12 Dec 2014 15:22:27 +0000 (16:22 +0100)]
avfilter/vf_spp: support 10bit per sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/avdct: support >8bit per sample dcts
Michael Niedermayer [Fri, 12 Dec 2014 15:21:54 +0000 (16:21 +0100)]
avcodec/avdct: support >8bit per sample dcts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agodoc/ffplay: remove duplicate threads option, this is documented in codecs.*
Michael Niedermayer [Mon, 15 Dec 2014 16:54:14 +0000 (17:54 +0100)]
doc/ffplay: remove duplicate threads option, this is documented in codecs.*

Fixes Ticket3610

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/xmv: Check return code of ff_alloc_extradata()
Michael Niedermayer [Mon, 15 Dec 2014 14:51:04 +0000 (15:51 +0100)]
avformat/xmv: Check return code of ff_alloc_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/flic: se av_freep() to avoid leaving stale extradata pointer
Michael Niedermayer [Mon, 15 Dec 2014 14:49:00 +0000 (15:49 +0100)]
avformat/flic: se av_freep() to avoid leaving stale extradata pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale extradata pointer
Michael Niedermayer [Mon, 15 Dec 2014 14:48:35 +0000 (15:48 +0100)]
avformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale extradata pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/xmv: use av_freep() to avoid leaving stale extradata pointer
Michael Niedermayer [Mon, 15 Dec 2014 14:47:54 +0000 (15:47 +0100)]
avformat/xmv: use av_freep() to avoid leaving stale extradata pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agotiff: set the correct return value when check_size() fails
Vittorio Giovara [Fri, 12 Dec 2014 18:25:58 +0000 (18:25 +0000)]
tiff: set the correct return value when check_size() fails

Only one instance affected and solved as other occurences.

2 years agotiff: Check the check_size() return value and forward it
Luca Barbato [Wed, 10 Dec 2014 01:44:20 +0000 (02:44 +0100)]
tiff: Check the check_size() return value and forward it

Also use the same type for add_entry and check_size.

Bug-Id: CID 700699
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovarao@gmail.com>
2 years agoprores: Evaluate all the quantizers
Luca Barbato [Wed, 10 Dec 2014 00:43:50 +0000 (01:43 +0100)]
prores: Evaluate all the quantizers

Prevent an uninitialized data access.

CC: libav-stable@libav.org
Bug-Id: CID 703824 / CID 703825
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2 years agomatroskadec: Fix read-after-free in matroska_read_seek()
Xiaohan Wang [Thu, 6 Nov 2014 20:59:54 +0000 (12:59 -0800)]
matroskadec: Fix read-after-free in matroska_read_seek()

In matroska_read_seek(), |tracks| is assigned at the begining of the
function. However, functions like matroska_parse_cues() could reallocate
the tracks and invalidate |tracks|.

This assigns |tracks| only before using it, so that it will not get
invalidated elsewhere.

Bug-Id: chromium/427266

2 years agompegvideo: move REBASE_PICTURE where it is used
Vittorio Giovara [Tue, 9 Dec 2014 16:47:53 +0000 (16:47 +0000)]
mpegvideo: move REBASE_PICTURE where it is used

Drop an unused #undef from h264 decoder.

2 years agompegvideo: remove unused function declaration
Vittorio Giovara [Tue, 9 Dec 2014 16:47:52 +0000 (16:47 +0000)]
mpegvideo: remove unused function declaration

2 years agohevc: always clip luma_log2_weight_denom
Vittorio Giovara [Wed, 10 Dec 2014 01:41:44 +0000 (01:41 +0000)]
hevc: always clip luma_log2_weight_denom

Its value shall be between 0 and 7 according to the specifications.

CC: libav-stable@libav.org
Bug-Id: CID 1257502

2 years agoavformat/assenc: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 15 Dec 2014 14:43:42 +0000 (15:43 +0100)]
avformat/assenc: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/avidec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 15 Dec 2014 14:43:14 +0000 (15:43 +0100)]
avformat/avidec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 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>
2 years agoMerge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'
Michael Niedermayer [Mon, 15 Dec 2014 12:01:32 +0000 (13:01 +0100)]
Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'

* commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/vaapi.c

See: f2118d44c9f18b3245bec2415c563d94201dcf5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'
Michael Niedermayer [Mon, 15 Dec 2014 11:19:16 +0000 (12:19 +0100)]
Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'

* commit '5a82ad644f281701eb22e0359fd732fac67aafa4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
libavcodec/svq1dec.c

See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'
Michael Niedermayer [Mon, 15 Dec 2014 11:04:31 +0000 (12:04 +0100)]
Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'

* commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06':
  asvenc: Forward the error instead of asserting on it

Conflicts:
libavcodec/asvenc.c

Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 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>
2 years agoconfigure: Set the default for --shlibdir to --libdir.
Carl Eugen Hoyos [Mon, 15 Dec 2014 01:49:12 +0000 (02:49 +0100)]
configure: Set the default for --shlibdir to --libdir.

Fixes ticket #4183.

Reviewed-by: Ivan Kalvachev
2 years agovp9/x86: sse2 MC assembly.
Ronald S. Bultje [Mon, 15 Dec 2014 01:13:24 +0000 (20:13 -0500)]
vp9/x86: sse2 MC assembly.

Also a slight change to the ssse3 code, which prevents a theoretical
overflow in the sharp filter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agolavf/mxfdec: Fix memleaks reading corrupt files.
Carl Eugen Hoyos [Mon, 15 Dec 2014 00:33:13 +0000 (01:33 +0100)]
lavf/mxfdec: Fix memleaks reading corrupt files.

Fixes ticket #4173.

Reviewed-by: Tomas Härdin
2 years agolavf/mxfdec: Factorize mxf_read_close().
Carl Eugen Hoyos [Mon, 15 Dec 2014 00:31:12 +0000 (01:31 +0100)]
lavf/mxfdec: Factorize mxf_read_close().

This will allow to fix leaks in a subsequent commit.

2 years agovp9/x86: 32bit and sse2 support for vp9 inverse transform assembly
Ronald S. Bultje [Sun, 14 Dec 2014 23:25:10 +0000 (00:25 +0100)]
vp9/x86: 32bit and sse2 support for vp9 inverse transform assembly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/dv: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 23:16:49 +0000 (00:16 +0100)]
avformat/dv: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agocmdutils: use macros for device test
Lukasz Marek [Sat, 13 Dec 2014 18:54:39 +0000 (19:54 +0100)]
cmdutils: use macros for device test

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2 years agolavd/alsa-audio-common: mark default device in device list
Lukasz Marek [Sat, 13 Dec 2014 18:46:15 +0000 (19:46 +0100)]
lavd/alsa-audio-common: mark default device in device list

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2 years agolavd/avdevice: use better option types for caps options
Lukasz Marek [Sat, 13 Dec 2014 19:25:42 +0000 (20:25 +0100)]
lavd/avdevice: use better option types for caps options

Using dedicated types allows to use format/layout names,
not just raw int values.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2 years agoMerge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
Michael Niedermayer [Sun, 14 Dec 2014 21:53:23 +0000 (22:53 +0100)]
Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'

* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'
Michael Niedermayer [Sun, 14 Dec 2014 21:22:19 +0000 (22:22 +0100)]
Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'
Michael Niedermayer [Sun, 14 Dec 2014 21:14:36 +0000 (22:14 +0100)]
Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'

* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'
Michael Niedermayer [Sun, 14 Dec 2014 21:07:08 +0000 (22:07 +0100)]
Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'

* commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9':
  vdpau: revector macro to reduce line span

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoMerge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'
Michael Niedermayer [Sun, 14 Dec 2014 21:05:13 +0000 (22:05 +0100)]
Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'

* commit 'e10e6651b50b4087f08813f3e503620db7413d3a':
  thread: use "" instead of <> for including the w32pthreads wrapper

See: 32eadfe453c32788ea57968e6e80f673f434739d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 years agovaapi: wrap codec specific functions in appropiate #ifs
Thiago Santos [Sun, 14 Dec 2014 20:59:27 +0000 (22:59 +0200)]
vaapi: wrap codec specific functions in appropiate #ifs

Fix linking when only a subset of vaapi decoders is enabled.

Bug-Id: 760
CC: libav-stable@libav.org
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2 years agosvq1dec: Unbreak the scratch buffer allocation
Michael Niedermayer [Sat, 6 Dec 2014 10:40:30 +0000 (11:40 +0100)]
svq1dec: Unbreak the scratch buffer allocation

The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.

Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.

Introduced in 7b588bb691644e1b3c168b99accf74248a24e3cf.

Bug-Id: 766
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2 years agoasvenc: Forward the error instead of asserting on it
Luca Barbato [Wed, 10 Dec 2014 02:40:25 +0000 (03:40 +0100)]
asvenc: Forward the error instead of asserting on it

Bug-Id: CID 732997
CC: libav-stable@libav.org
2 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>
2 years agoavformat/mp3dec: Name the dummy variable as what it is, to avoid confusion
Michael Niedermayer [Sun, 14 Dec 2014 19:08:13 +0000 (20:08 +0100)]
avformat/mp3dec: Name the dummy variable as what it is, to avoid confusion

Found-by: nattyzs <nattyzs@163.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 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>
2 years agovdpau: add mapping for H.264 Constrained Baseline profile and fallback
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:21 +0000 (18:42 +0200)]
vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2 years agovdpau: add mapping for H.264 Extended profile
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:20 +0000 (18:42 +0200)]
vdpau: add mapping for H.264 Extended profile

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2 years agovdpau: revector macro to reduce line span
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:19 +0000 (18:42 +0200)]
vdpau: revector macro to reduce line span

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2 years agothread: use "" instead of <> for including the w32pthreads wrapper
Anton Khirnov [Mon, 1 Dec 2014 13:15:36 +0000 (14:15 +0100)]
thread: use "" instead of <> for including the w32pthreads wrapper

Found-by: Dave Yeo <dave.r.yeo@gmail.com>
2 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>
2 years agoavfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 14:56:32 +0000 (15:56 +0100)]
avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 14:54:45 +0000 (15:54 +0100)]
avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()
Michael Niedermayer [Fri, 12 Dec 2014 13:46:19 +0000 (14:46 +0100)]
avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/nutenc: store the actual r_frame_rate in the corresponding field if available
Michael Niedermayer [Sun, 14 Dec 2014 00:12:27 +0000 (01:12 +0100)]
avformat/nutenc: store the actual r_frame_rate in the corresponding field if available

Fixes Ticket 3629 part3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoffmpeg: forward r_frame_rate to the muxer in case of stream copy
Michael Niedermayer [Sun, 14 Dec 2014 00:16:39 +0000 (01:16 +0100)]
ffmpeg: forward r_frame_rate to the muxer in case of stream copy

Fixes Ticket3629 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()
Michael Niedermayer [Sun, 14 Dec 2014 00:36:29 +0000 (01:36 +0100)]
avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()

This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage

Fixes Ticket3629 part1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec: fix wording in AVSubtitleRect doxy
Clément Bœsch [Sat, 13 Dec 2014 22:35:22 +0000 (23:35 +0100)]
avcodec: fix wording in AVSubtitleRect doxy

2 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>
2 years agofix "than" typo
Michael Niedermayer [Sat, 13 Dec 2014 19:52:31 +0000 (20:52 +0100)]
fix "than" typo

Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/utils: Do not estimate the container bitrate from the streams if one video...
Michael Niedermayer [Sat, 13 Dec 2014 18:20:10 +0000 (19:20 +0100)]
avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_uspp: fix gray pixfmt handling
Michael Niedermayer [Sat, 13 Dec 2014 16:16:49 +0000 (17:16 +0100)]
avfilter/vf_uspp: fix gray pixfmt handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_uspp: fix used chroma subsampling factors
Michael Niedermayer [Sat, 13 Dec 2014 15:54:13 +0000 (16:54 +0100)]
avfilter/vf_uspp: fix used chroma subsampling factors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_uspp: fix used pix_fmt
Michael Niedermayer [Sat, 13 Dec 2014 15:38:44 +0000 (16:38 +0100)]
avfilter/vf_uspp: fix used pix_fmt

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/dvdsubdec: Avoid strerror() due to thread saftey
Michael Niedermayer [Sat, 13 Dec 2014 14:15:07 +0000 (15:15 +0100)]
avcodec/dvdsubdec: Avoid strerror() due to thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavcodec/libxvid_rc: Avoid strerror() for thread saftey
Michael Niedermayer [Sat, 13 Dec 2014 14:12:37 +0000 (15:12 +0100)]
avcodec/libxvid_rc: Avoid strerror() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/mov: Simplify code by using OFFSET() and FLAGS macros
Michael Niedermayer [Sat, 13 Dec 2014 14:06:19 +0000 (15:06 +0100)]
avformat/mov: Simplify code by using OFFSET() and FLAGS macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 13 Dec 2014 12:54:16 +0000 (13:54 +0100)]
avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 13 Dec 2014 12:53:53 +0000 (13:53 +0100)]
avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_uspp: Add grayscale support
Michael Niedermayer [Sat, 13 Dec 2014 04:33:19 +0000 (05:33 +0100)]
avfilter/vf_uspp: Add grayscale support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_uspp: assert that the qp_type is valid
Michael Niedermayer [Sat, 13 Dec 2014 04:30:39 +0000 (05:30 +0100)]
avfilter/vf_uspp: assert that the qp_type is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agodoc: add FFREPORT example
Lou Logan [Thu, 11 Dec 2014 20:46:54 +0000 (11:46 -0900)]
doc: add FFREPORT example

And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>
2 years agolavu/dict: check for malloc failures
wm4 [Fri, 12 Dec 2014 17:15:39 +0000 (18:15 +0100)]
lavu/dict: check for malloc failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavformat/utils: check for malloc failure
wm4 [Fri, 12 Dec 2014 21:22:55 +0000 (22:22 +0100)]
avformat/utils: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agolavc/avpacket: check for malloc failure
wm4 [Fri, 12 Dec 2014 17:15:42 +0000 (18:15 +0100)]
lavc/avpacket: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoDelete mp=uspp
Arwa Arif [Fri, 12 Dec 2014 05:44:26 +0000 (11:14 +0530)]
Delete mp=uspp

2 years agoavfilter/vf_spp: The qp array width is qp_stride not stride/16
Michael Niedermayer [Fri, 12 Dec 2014 17:14:15 +0000 (18:14 +0100)]
avfilter/vf_spp: The qp array width is qp_stride not stride/16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavfilter/vf_spp: Allocate qp storage after qp_stride is known
Michael Niedermayer [Fri, 12 Dec 2014 17:13:13 +0000 (18:13 +0100)]
avfilter/vf_spp: Allocate qp storage after qp_stride is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 years agoavdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 12 Dec 2014 13:46:46 +0000 (14:46 +0100)]
avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory

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