ffmpeg.git
5 years agoavdevice/xcbgrab: set avclass category
Michael Niedermayer [Tue, 28 Oct 2014 11:07:20 +0000 (12:07 +0100)]
avdevice/xcbgrab: set avclass category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'
Michael Niedermayer [Tue, 28 Oct 2014 10:16:17 +0000 (11:16 +0100)]
Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'

* commit '4ad1eba011860224831ce0bb3123f6f55716b68a':
  lavd: fix building x11grab after a6674d2

no change as the buggy line was not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
Michael Niedermayer [Tue, 28 Oct 2014 10:04:51 +0000 (11:04 +0100)]
Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'

* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
  vdpau: return MAIN instead of BASELINE for H.264 CBP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
Michael Niedermayer [Tue, 28 Oct 2014 09:58:03 +0000 (10:58 +0100)]
Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'

* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893':
  vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd: fix building x11grab after a6674d2
Anton Khirnov [Tue, 28 Oct 2014 06:22:00 +0000 (07:22 +0100)]
lavd: fix building x11grab after a6674d2

5 years agovdpau: return MAIN instead of BASELINE for H.264 CBP
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:33:58 +0000 (21:33 +0200)]
vdpau: return MAIN instead of BASELINE for H.264 CBP

This is the same as the previous change, but for applications using the
old API (such as VLC 2.2).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agovdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:24:12 +0000 (21:24 +0200)]
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP

The H.264 Constrained Baseline Profile (CBP) is a subset of both the
Main Profile and the Baseline Profile. In principles, a hardware
decoder that supports either of those can decode CBP content. As it
happens, Main is supported by all VDPAU drivers, and Baseline is not.

So favor map CBP to MP for now. Hopefully in the future libvdpau will
offer an explicit choice for CBP.

This fixes bug 757.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/dirac_arith: fix integer overflow
Michael Niedermayer [Tue, 28 Oct 2014 01:14:41 +0000 (02:14 +0100)]
avcodec/dirac_arith: fix integer overflow

Fixes: asan_heap-oob_1078676_9_008.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y

Fixes very long but finite loop
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: Use 64bit in calculation of codeblock coordinates
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Use 64bit in calculation of codeblock coordinates

Fixes integer overflow
Fixes out of array read
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '11467ecf519788f2e2f49c63a17eb600e618489e'
Michael Niedermayer [Mon, 27 Oct 2014 22:33:39 +0000 (23:33 +0100)]
Merge commit '11467ecf519788f2e2f49c63a17eb600e618489e'

* commit '11467ecf519788f2e2f49c63a17eb600e618489e':
  mxfdec: reduce loop bound in mxf_read_pixel_layout()

See: 187630b2449f1eae1096f81f31bab7d81bed3cf1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/bethsoftvid: print error in case the side date failed to be allocated
Michael Niedermayer [Mon, 27 Oct 2014 22:20:21 +0000 (23:20 +0100)]
avformat/bethsoftvid: print error in case the side date failed to be allocated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'
Michael Niedermayer [Mon, 27 Oct 2014 22:08:50 +0000 (23:08 +0100)]
Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'

* commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600':
  bethsoftvid: check return value and clean memory

Conflicts:
libavformat/bethsoftvid.c

See: 3632f35c8e163f6aa6d63c317e3e1fca6a4a5fab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/filmstripdec: Fix several integer overflows
Michael Niedermayer [Mon, 27 Oct 2014 21:56:04 +0000 (22:56 +0100)]
avformat/filmstripdec: Fix several integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
Michael Niedermayer [Mon, 27 Oct 2014 21:25:37 +0000 (22:25 +0100)]
Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'

* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f':
  filmstripdec: avoid integer overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '090c67d586e3916f9acc49e010b6389d07f97153'
Michael Niedermayer [Mon, 27 Oct 2014 21:18:03 +0000 (22:18 +0100)]
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'

* commit '090c67d586e3916f9acc49e010b6389d07f97153':
  matroskaenc: write correct Display{Width, Height} in stereo encoding

Conflicts:
libavformat/matroskaenc.c

See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
Michael Niedermayer [Mon, 27 Oct 2014 20:26:51 +0000 (21:26 +0100)]
Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96':
  xcbgrab: XCB-based screen capture

Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sgidec: fix count check
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix count check

Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sgidec: fix linesize for 16bit
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix linesize for 16bit

Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomxfdec: reduce loop bound in mxf_read_pixel_layout()
Tomas Härdin [Mon, 27 Oct 2014 12:59:48 +0000 (13:59 +0100)]
mxfdec: reduce loop bound in mxf_read_pixel_layout()

Makes coverity less confused and code more readable.

Bug-Id: CID 732262

5 years agobethsoftvid: check return value and clean memory
Vittorio Giovara [Fri, 24 Oct 2014 12:15:34 +0000 (13:15 +0100)]
bethsoftvid: check return value and clean memory

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

5 years agofilmstripdec: avoid integer overflow
Vittorio Giovara [Fri, 24 Oct 2014 12:15:39 +0000 (13:15 +0100)]
filmstripdec: avoid integer overflow

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

5 years agomatroskaenc: write correct Display{Width, Height} in stereo encoding
Vittorio Giovara [Wed, 22 Oct 2014 13:36:32 +0000 (14:36 +0100)]
matroskaenc: write correct Display{Width, Height} in stereo encoding

should be the raw amount of pixels (for example 3840x1080 for full HD side by
side) and the DisplayWidth/Height in pixels should be the amount of pixels for
one plane (1920x1080 for that full HD stream)."

So, move the aspect ratio check in the mkv_write_stereo_mode() function
and always write the embl when stereo format and/or aspect ration is set.
Also add a few comments to that function.

CC: libav-stable@libav.org
Found-by: Asan Usipov <asan.usipov@gmail.com>
5 years agolavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation...
Thilo Borgmann [Mon, 27 Oct 2014 14:20:27 +0000 (15:20 +0100)]
lavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation of screen capture capabilities.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: Check default display window bitstream and skip if invalid
Michael Niedermayer [Mon, 27 Oct 2014 13:03:09 +0000 (14:03 +0100)]
avcodec/hevc_ps: Check default display window bitstream and skip if invalid

Fixes Ticket4035

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 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>
5 years agoavcodec/h264: simplify find_start_code()
Michael Niedermayer [Mon, 27 Oct 2014 03:24:20 +0000 (04:24 +0100)]
avcodec/h264: simplify find_start_code()

this also uses avpriv_find_start_code(), though no speed change is expected as
the area searched is generally small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMove get_avc_nalsize() and find_start_code() to h264.h
Michael Niedermayer [Mon, 27 Oct 2014 03:22:42 +0000 (04:22 +0100)]
Move get_avc_nalsize() and find_start_code() to h264.h

This allows sharing them with the h264 parser

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Add support for Opus in MPEG-TS
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avformat/mpegts: Add support for Opus in MPEG-TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Add support for Opus in MPEG-TS
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avcodec: Add support for Opus in MPEG-TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv: move inverse weight tables to decoder
Christophe Gisquet [Sat, 25 Oct 2014 11:19:25 +0000 (11:19 +0000)]
dv: move inverse weight tables to decoder

The encoder has its own tables and does not access the idct_factor
member of the DVVideoContext structure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv: fix weight table for 2x4x8 transform
Christophe Gisquet [Sat, 25 Oct 2014 11:19:23 +0000 (11:19 +0000)]
dv: fix weight table for 2x4x8 transform

The coefficients must be in the appropriate zigzag scan order.
Also fix their values at the same time, as they were pretty wrong.

Fixes ticket #2970.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/intmath: enable builtin intrinsics for icl and msvc.
Matthew Oliver [Sun, 26 Oct 2014 14:43:15 +0000 (01:43 +1100)]
avutil/intmath: enable builtin intrinsics for icl and msvc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:52:12 +0000 (15:52 +0100)]
ffmpeg_opt: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:51:58 +0000 (15:51 +0100)]
avformat/matroskadec: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mlvdec: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:51:37 +0000 (15:51 +0100)]
avformat/mlvdec: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoxcbgrab: XCB-based screen capture
Luca Barbato [Sun, 24 Aug 2014 12:18:22 +0000 (14:18 +0200)]
xcbgrab: XCB-based screen capture

Matches the x11grab screen capture by features.

5 years agoMerge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'
Michael Niedermayer [Sun, 26 Oct 2014 02:22:28 +0000 (03:22 +0100)]
Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'

* commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8':
  lavf: Implement ff_brktimegm using gmtime_r

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
Michael Niedermayer [Sun, 26 Oct 2014 02:12:37 +0000 (03:12 +0100)]
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'

* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
  drawtext: Remove the ifdef for localtime_r

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'
Michael Niedermayer [Sun, 26 Oct 2014 01:38:26 +0000 (02:38 +0100)]
Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'

* commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de':
  Use gmtime_r instead of gmtime and localtime_r instead of localtime

Conflicts:
libavformat/mov.c
libavformat/mxfenc.c
libavformat/wtvdec.c
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
Michael Niedermayer [Sun, 26 Oct 2014 01:26:45 +0000 (02:26 +0100)]
Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'

* commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e':
  lavu: Provide fallbacks for gmtime_r and localtime_r

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
Michael Niedermayer [Sun, 26 Oct 2014 01:06:40 +0000 (02:06 +0100)]
Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'

* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
  lavf: Check the return value of strftime

Conflicts:
libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'
Michael Niedermayer [Sun, 26 Oct 2014 00:21:42 +0000 (02:21 +0200)]
Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'

* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/mxfdec: read source timecode from pulldown component
Mark Reid [Sat, 25 Oct 2014 00:31:24 +0000 (17:31 -0700)]
libavformat/mxfdec: read source timecode from pulldown component

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: Implement ff_brktimegm using gmtime_r
Martin Storsjö [Fri, 24 Oct 2014 08:08:28 +0000 (11:08 +0300)]
lavf: Implement ff_brktimegm using gmtime_r

While a standalone implementation is nice, we already depend on
gmtime and gmtime_r in a number of places.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodrawtext: Remove the ifdef for localtime_r
Martin Storsjö [Fri, 24 Oct 2014 07:59:34 +0000 (10:59 +0300)]
drawtext: Remove the ifdef for localtime_r

If it isn't available in the system, we've got a fallback to
the normal localtime function, so normal code can assume it is
available as long as time_internal.h is included.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoUse gmtime_r instead of gmtime and localtime_r instead of localtime
Martin Storsjö [Fri, 24 Oct 2014 07:46:36 +0000 (10:46 +0300)]
Use gmtime_r instead of gmtime and localtime_r instead of localtime

gmtime isn't thread safe in general. In msvcrt (which lacks gmtime_r),
the buffer used by gmtime is thread specific though.

One call to localtime is left in avconv_opt.c, where thread safety
shouldn't matter (instead of making avconv depend on the libavutil
internal header).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavu: Provide fallbacks for gmtime_r and localtime_r
Martin Storsjö [Fri, 24 Oct 2014 07:33:19 +0000 (10:33 +0300)]
lavu: Provide fallbacks for gmtime_r and localtime_r

This allows writing most code as if they always are is available.

These are ok to use from other libraries even though it's not a
public header, since they only provide an inline declaration, and
doesn't add an actual dependency on lavu internals. (This can be
considered more a build system compatibility fallback than a
libavutil feature.)

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavf: Check the return value of strftime
Martin Storsjö [Fri, 24 Oct 2014 07:43:20 +0000 (10:43 +0300)]
lavf: Check the return value of strftime

If the buffer provided to strftime is too small, the buffer contents
are indeterminate - it does not guarantee actually null terminating
the buffer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agowtv: Avoid needlessly calling gmtime twice with the same argument
Martin Storsjö [Fri, 24 Oct 2014 07:36:54 +0000 (10:36 +0300)]
wtv: Avoid needlessly calling gmtime twice with the same argument

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavd/avfoundation: Add support for screen capturing.
Thilo Borgmann [Sat, 25 Oct 2014 15:02:28 +0000 (17:02 +0200)]
lavd/avfoundation: Add support for screen capturing.

Patch based on pull-request by Joseph Benden <joe@benden.us>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rdt: Forward whitelists to rdt demuxer
Michael Niedermayer [Thu, 23 Oct 2014 22:23:52 +0000 (00:23 +0200)]
avformat/rdt: Forward whitelists to rdt demuxer

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoopts: add list device sources/sinks options
Lukasz Marek [Wed, 6 Aug 2014 22:45:26 +0000 (00:45 +0200)]
opts: add list device sources/sinks options

Allows to list sources/sinks of the devices that implement
that functionality.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agodoc/fftools-common-opts: document -devices option
Lukasz Marek [Fri, 24 Oct 2014 21:31:03 +0000 (23:31 +0200)]
doc/fftools-common-opts: document -devices option

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agodv: more precise weight table for 8x8
Christophe Gisquet [Sat, 25 Oct 2014 11:19:22 +0000 (11:19 +0000)]
dv: more precise weight table for 8x8

It is derived from the actual equations of the specs. In
particular, it is closer to the inverse of what the encoder uses.

fate tests accordingly updated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv: use smaller type for weight tables
Christophe Gisquet [Sat, 25 Oct 2014 11:19:21 +0000 (11:19 +0000)]
dv: use smaller type for weight tables

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv: better split weight tables assignment
Christophe Gisquet [Sat, 25 Oct 2014 11:19:20 +0000 (11:19 +0000)]
dv: better split weight tables assignment

This is a mostly cosmetical patch in preparation for the following.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: Use av_find_input_format() instead of directly linking to the demuxer
Michael Niedermayer [Sat, 25 Oct 2014 14:28:41 +0000 (16:28 +0200)]
avformat/mpeg: Use av_find_input_format() instead of directly linking to the demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_asf: Use av_find_input_format() instead of directly linking to the...
Michael Niedermayer [Sat, 25 Oct 2014 14:28:03 +0000 (16:28 +0200)]
avformat/rtpdec_asf: Use av_find_input_format() instead of directly linking to the demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/ffhash: read errno before calling functions which might change it
Michael Niedermayer [Sat, 25 Oct 2014 14:12:16 +0000 (16:12 +0200)]
tools/ffhash: read errno before calling functions which might change it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: Read errno before av_log() as the callback from av_log() might affect errno
Michael Niedermayer [Sat, 25 Oct 2014 11:48:56 +0000 (13:48 +0200)]
avformat: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hdsenc: Read errno before av_log() as the callback from av_log() might affec...
Michael Niedermayer [Sat, 25 Oct 2014 11:20:23 +0000 (13:20 +0200)]
avformat/hdsenc: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Read errno before av_log() as the callback from av_log() might affect errno
Michael Niedermayer [Sat, 25 Oct 2014 11:19:41 +0000 (13:19 +0200)]
avfilter: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdeviece: Read errno before av_log() as the callback from av_log() might affect...
Michael Niedermayer [Sat, 25 Oct 2014 11:19:10 +0000 (13:19 +0200)]
avdeviece: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Read errno before av_log() as the callback from av_log() might affect errno
Michael Niedermayer [Sat, 25 Oct 2014 11:18:47 +0000 (13:18 +0200)]
avcodec: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: Read errno before av_log() as the callback from av_log() might affect errno
Michael Niedermayer [Sat, 25 Oct 2014 11:17:26 +0000 (13:17 +0200)]
cmdutils: Read errno before av_log() as the callback from av_log() might affect errno

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: Print error message on failure of ff_rename()
Michael Niedermayer [Sat, 25 Oct 2014 11:04:18 +0000 (13:04 +0200)]
avformat: Print error message on failure of ff_rename()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'
Michael Niedermayer [Sat, 25 Oct 2014 02:57:05 +0000 (04:57 +0200)]
Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'

* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
  mov: fix assigment check

Conflicts:
libavformat/mov.c

See: af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'
Michael Niedermayer [Sat, 25 Oct 2014 02:55:17 +0000 (04:55 +0200)]
Merge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'

* commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869':
  mxfenc: Fix possible integer overflows

Conflicts:
libavformat/mxfenc.c

See: e3ba817b95bbdc7c8aaf83b4a6804d1b49eb4de4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141'
Michael Niedermayer [Sat, 25 Oct 2014 02:51:44 +0000 (04:51 +0200)]
Merge commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141'

* commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141':
  mxfdec: add missing break

See: cbda76c7c65c5c0a4d5de03baad96c4a940c7336
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'
Michael Niedermayer [Sat, 25 Oct 2014 02:45:23 +0000 (04:45 +0200)]
Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'

* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
  matroskaenc: check avio_open_dyn_buf return value

Conflicts:
libavformat/matroskaenc.c

See: b1f517f503139ab9d0c406228b53663e86a128df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
Michael Niedermayer [Sat, 25 Oct 2014 02:37:27 +0000 (04:37 +0200)]
Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'

* commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b':
  matroskadec: check return values

Conflicts:
libavformat/matroskadec.c

See: 1116491c53156dd1972eca3e65d5a3b8529c4658
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'
Michael Niedermayer [Sat, 25 Oct 2014 02:31:44 +0000 (04:31 +0200)]
Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'

* commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356':
  matroskadec: fix leak on error

Conflicts:
libavformat/matroskadec.c

See: 2fe4b6210c4b56ecfe4668c78611a8a679303511
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7785ce1c769369abf85b276148548a5510aabb5f'
Michael Niedermayer [Sat, 25 Oct 2014 02:24:16 +0000 (04:24 +0200)]
Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'

* commit '7785ce1c769369abf85b276148548a5510aabb5f':
  lavf: replace rename() with ff_rename()

Conflicts:
libavformat/hdsenc.c
libavformat/internal.h

See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'
Michael Niedermayer [Sat, 25 Oct 2014 01:44:17 +0000 (03:44 +0200)]
Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'

* commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc':
  flac_picture: prevent a possible out of bound write

This is only partly merged, the condition this checks for
is impossible to be true as it would imply avio_read() to
read more than the size passed to it

See: 731f7eaaade4c0cf91f8008cc30c0342caa64df1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'
Michael Niedermayer [Sat, 25 Oct 2014 01:37:21 +0000 (03:37 +0200)]
Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'

* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
  img2dec: check av_new_packet return value

Conflicts:
libavformat/img2dec.c

See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'
Michael Niedermayer [Sat, 25 Oct 2014 01:27:13 +0000 (03:27 +0200)]
Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'

* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
  audiointerleave: check av_new_packet return value

Conflicts:
libavformat/audiointerleave.c

See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
Michael Niedermayer [Sat, 25 Oct 2014 01:08:19 +0000 (03:08 +0200)]
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
  avfilter: check filter link validity

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: fix assigment check
Vittorio Giovara [Mon, 20 Oct 2014 13:11:25 +0000 (14:11 +0100)]
mov: fix assigment check

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

5 years agomxfenc: Fix possible integer overflows
Tomas Härdin [Thu, 23 Oct 2014 23:05:59 +0000 (00:05 +0100)]
mxfenc: Fix possible integer overflows

None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.

CC: libav-stable@libav.org
Bug-Id: CID 700568 / CID 700569 / CID 700570 /
        CID 700571 / CID 700572 / CID 700573

5 years agomxfdec: add missing break
Vittorio Giovara [Thu, 23 Oct 2014 23:05:57 +0000 (00:05 +0100)]
mxfdec: add missing break

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

5 years agomatroskaenc: check avio_open_dyn_buf return value
Vittorio Giovara [Thu, 23 Oct 2014 23:05:55 +0000 (00:05 +0100)]
matroskaenc: check avio_open_dyn_buf return value

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

5 years agomatroskadec: check return values
Vittorio Giovara [Thu, 23 Oct 2014 23:05:53 +0000 (00:05 +0100)]
matroskadec: check return values

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

5 years agomatroskadec: fix leak on error
Vittorio Giovara [Thu, 23 Oct 2014 23:05:52 +0000 (00:05 +0100)]
matroskadec: fix leak on error

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

5 years agolavf: replace rename() with ff_rename()
Luca Barbato [Sun, 19 Oct 2014 22:48:49 +0000 (00:48 +0200)]
lavf: replace rename() with ff_rename()

The new function wraps errno so that its value is correctly reported
when other functions overwrite it (eg. in case of logging).

CC: libav-stable@libav.org
Bug-Id: CID 1135748
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoflac_picture: prevent a possible out of bound write
Vittorio Giovara [Mon, 20 Oct 2014 13:11:21 +0000 (14:11 +0100)]
flac_picture: prevent a possible out of bound write

At "mimetype[len] = 0;" mimetype is a 64 element array and len might be
equal to or greater than that.

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

5 years agoimg2dec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:15 +0000 (14:11 +0100)]
img2dec: check av_new_packet return value

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

5 years agoaudiointerleave: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:14 +0000 (14:11 +0100)]
audiointerleave: check av_new_packet return value

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

5 years agoavfilter: check filter link validity
Vittorio Giovara [Mon, 20 Oct 2014 13:11:13 +0000 (14:11 +0100)]
avfilter: check filter link validity

Remove now redundant check.

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

5 years agoChangelog: add entry for libutvideo 422P10
Michael Niedermayer [Fri, 24 Oct 2014 22:22:04 +0000 (00:22 +0200)]
Changelog: add entry for libutvideo 422P10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideodec: Support YUV422P10
Michael Niedermayer [Sun, 19 Oct 2014 12:34:09 +0000 (14:34 +0200)]
avcodec/libutvideodec: Support YUV422P10

Based on ConvertToPlanar() from libutvideo
libutvideo sadly does not seem to support exporting its internal planar buffers

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdded support for G2M5 codec
Eric Zimmerman [Thu, 9 Oct 2014 17:12:44 +0000 (10:12 -0700)]
Added support for G2M5 codec

This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: Add and use ff_copy_whitelists()
Michael Niedermayer [Fri, 24 Oct 2014 17:23:23 +0000 (19:23 +0200)]
avformat: Add and use ff_copy_whitelists()

Fixes potential security issue in case of running out of memory

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: warn user when remapping streams.
Benoit Fouet [Fri, 24 Oct 2014 10:31:45 +0000 (12:31 +0200)]
avcodec/aacdec: warn user when remapping streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: also accept Lavc as shortname to read delays
Michael Niedermayer [Fri, 24 Oct 2014 16:06:26 +0000 (18:06 +0200)]
avformat/mp3dec: also accept Lavc as shortname to read delays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of...
Michael Niedermayer [Fri, 24 Oct 2014 13:47:33 +0000 (15:47 +0200)]
avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'
Michael Niedermayer [Fri, 24 Oct 2014 12:48:12 +0000 (14:48 +0200)]
Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
  mp3enc: write full LAME frame

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '88b32673db39440422a73ec3047d3326c96b4fb2'
Michael Niedermayer [Fri, 24 Oct 2014 11:04:34 +0000 (13:04 +0200)]
Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'

* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'
Michael Niedermayer [Fri, 24 Oct 2014 10:58:22 +0000 (12:58 +0200)]
Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'

* commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce':
  doc: reword the mp3 muxer documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '99143140dea12363af680d02e23cb42cfe191679'
Michael Niedermayer [Fri, 24 Oct 2014 10:49:53 +0000 (12:49 +0200)]
Merge commit '99143140dea12363af680d02e23cb42cfe191679'

* commit '99143140dea12363af680d02e23cb42cfe191679':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

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