ffmpeg.git
5 years agoavfilter/vf_mp: remove incorrect usage of AVFrame.type
Michael Niedermayer [Sat, 30 Aug 2014 10:16:46 +0000 (12:16 +0200)]
avfilter/vf_mp: remove incorrect usage of AVFrame.type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: check coeffs for validity
Michael Niedermayer [Sat, 30 Aug 2014 00:12:10 +0000 (02:12 +0200)]
avcodec/snow: check coeffs for validity

Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd missing "const" all over the place.
Reimar Döffinger [Thu, 28 Aug 2014 22:32:32 +0000 (00:32 +0200)]
Add missing "const" all over the place.

Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agopatcheck: check for pointer arrays that are not const.
Reimar Döffinger [Thu, 28 Aug 2014 22:32:07 +0000 (00:32 +0200)]
patcheck: check for pointer arrays that are not const.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavformat/wtvdec: seek over broken chunks
Peter Ross [Fri, 29 Aug 2014 06:42:04 +0000 (16:42 +1000)]
avformat/wtvdec: seek over broken chunks

Fixes ticket #3898

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/webmdashenc: use av_strlcpy() and allocate enough space
Michael Niedermayer [Fri, 29 Aug 2014 11:02:34 +0000 (13:02 +0200)]
avformat/webmdashenc: use av_strlcpy() and allocate enough space

Fixes out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate/vpx: make webm dash manifest tests depend on the WEBM_DASH_MANIFEST demuxer
Michael Niedermayer [Fri, 29 Aug 2014 10:27:10 +0000 (12:27 +0200)]
fate/vpx: make webm dash manifest tests depend on the WEBM_DASH_MANIFEST demuxer

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wavpack: increase WV_MAX_SAMPLES
Paul B Mahol [Fri, 29 Aug 2014 10:37:49 +0000 (10:37 +0000)]
avcodec/wavpack: increase WV_MAX_SAMPLES

This is maximal number of samples per frame that current wavpack
can create.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agofate: Add basic tests for WebM Dash Manifest
Vignesh Venkatasubramanian [Mon, 25 Aug 2014 22:03:45 +0000 (15:03 -0700)]
fate: Add basic tests for WebM Dash Manifest

Add fate tests that test out the functionality of WebM DASH
Manifest XML generation. This patch contains the vpx.mak file
changes and the reference gold XML files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avcodec: fix missing doxygen comment marker
Michael Niedermayer [Thu, 28 Aug 2014 23:31:10 +0000 (01:31 +0200)]
avcodec/avcodec: fix missing doxygen comment marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier
Michael Niedermayer [Thu, 28 Aug 2014 23:26:52 +0000 (01:26 +0200)]
avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'
Michael Niedermayer [Thu, 28 Aug 2014 23:08:57 +0000 (01:08 +0200)]
Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
  license: Mention that vf_interlace is GPL, not LGPL

Conflicts:
LICENSE.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
Michael Niedermayer [Thu, 28 Aug 2014 22:30:47 +0000 (00:30 +0200)]
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'

* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
Michael Niedermayer [Thu, 28 Aug 2014 21:40:31 +0000 (23:40 +0200)]
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'

* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c

See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Fix missing {} in Stream to Packet side data code
Michael Niedermayer [Thu, 28 Aug 2014 21:34:20 +0000 (23:34 +0200)]
ffmpeg: Fix missing {} in Stream to Packet side data code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9301486408a480629336af4d7fd873c0f28fb2d5'
Michael Niedermayer [Thu, 28 Aug 2014 20:23:01 +0000 (22:23 +0200)]
Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'
Michael Niedermayer [Thu, 28 Aug 2014 20:12:03 +0000 (22:12 +0200)]
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'

* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'
Michael Niedermayer [Thu, 28 Aug 2014 20:06:48 +0000 (22:06 +0200)]
Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'

* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
  x11grab: Use a typedef for the context, as most other code does

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
Michael Niedermayer [Thu, 28 Aug 2014 19:47:32 +0000 (21:47 +0200)]
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
libavdevice/x11grab.c

See: 9af209712099699d717596f55b08b3bac8b6b563
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
Michael Niedermayer [Thu, 28 Aug 2014 19:39:19 +0000 (21:39 +0200)]
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
Michael Niedermayer [Thu, 28 Aug 2014 19:21:47 +0000 (21:21 +0200)]
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'

* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolicense: Mention that vf_interlace is GPL, not LGPL
Diego Biurrun [Wed, 27 Aug 2014 11:14:20 +0000 (13:14 +0200)]
license: Mention that vf_interlace is GPL, not LGPL

5 years agomatroskaenc: convert avstream stereo3d side data during encoding
Vittorio Giovara [Tue, 5 Aug 2014 10:16:17 +0000 (11:16 +0100)]
matroskaenc: convert avstream stereo3d side data during encoding

Write the StereoMode Embl to bitstream.

5 years agomatroskadec: parse stereo mode on decoding
Vittorio Giovara [Tue, 12 Aug 2014 21:28:49 +0000 (22:28 +0100)]
matroskadec: parse stereo mode on decoding

Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185

5 years agoavcodec: add stream-level stereo3d side data
Vittorio Giovara [Wed, 23 Jul 2014 08:21:28 +0000 (09:21 +0100)]
avcodec: add stream-level stereo3d side data

5 years agomatroska: list supported extensions
Vittorio Giovara [Wed, 23 Jul 2014 08:49:24 +0000 (09:49 +0100)]
matroska: list supported extensions

5 years agoavformat/soxenc: return more meaningful error code
Paul B Mahol [Thu, 28 Aug 2014 15:48:13 +0000 (15:48 +0000)]
avformat/soxenc: return more meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning
Michael Niedermayer [Thu, 28 Aug 2014 14:03:28 +0000 (16:03 +0200)]
avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flashsv2enc: fix "unused variable" warnings
Michael Niedermayer [Thu, 28 Aug 2014 13:29:53 +0000 (15:29 +0200)]
avcodec/flashsv2enc: fix "unused variable" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox11grab: Use a typedef for the context, as most other code does
Luca Barbato [Wed, 27 Aug 2014 02:43:50 +0000 (04:43 +0200)]
x11grab: Use a typedef for the context, as most other code does

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agox11grab: Drop a spurious space in the extension reporting message
Luca Barbato [Wed, 27 Aug 2014 02:43:49 +0000 (04:43 +0200)]
x11grab: Drop a spurious space in the extension reporting message

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/libvpxenc: Adds support for constant quality mode in VP9.
Deb Mukherjee [Wed, 27 Aug 2014 20:04:08 +0000 (13:04 -0700)]
avcodec/libvpxenc: Adds support for constant quality mode in VP9.

Changes in the parameter mapping for libvpx to support the constant
quality mode in VP9. The assumption in the patch is that if crf is
provided but bitrate is 0, then the 'constant quality' mode of VP9
is used. However if both are present, the 'constrained quality' mode
is used as before.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox11grab: Small near-cosmetic refactorings
Luca Barbato [Wed, 27 Aug 2014 02:43:48 +0000 (04:43 +0200)]
x11grab: Small near-cosmetic refactorings

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agox11grab: K&R formatting cosmetics
Luca Barbato [Wed, 27 Aug 2014 02:43:47 +0000 (04:43 +0200)]
x11grab: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavformat/icoenc: Remove deprecated use of codec_name
Michael Niedermayer [Wed, 27 Aug 2014 20:37:38 +0000 (22:37 +0200)]
avformat/icoenc: Remove deprecated use of codec_name

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/ffprobe: fix -show_entries example
Stefano Sabatini [Thu, 28 Aug 2014 10:19:33 +0000 (12:19 +0200)]
doc/ffprobe: fix -show_entries example

5 years agoAdds support for setting aq_mode in libvpx encoder
Deb Mukherjee [Tue, 26 Aug 2014 00:17:39 +0000 (17:17 -0700)]
Adds support for setting aq_mode in libvpx encoder

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoReplace incorrect use of "multiply" with "multiple"
James Darnley [Wed, 27 Aug 2014 20:39:29 +0000 (22:39 +0200)]
Replace incorrect use of "multiply" with "multiple"

Also replace the plural form "multiplies" with "multiples".

5 years agoavformat/rtpdec_asf: fix compiler warning about const qualifier being discarded
Michael Niedermayer [Wed, 27 Aug 2014 21:53:53 +0000 (23:53 +0200)]
avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rdt: fix compiler warning about const qualifier being discarded
Michael Niedermayer [Wed, 27 Aug 2014 21:52:40 +0000 (23:52 +0200)]
avformat/rdt: fix compiler warning about const qualifier being discarded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: remove uses of deprecated url_feof()
Michael Niedermayer [Wed, 27 Aug 2014 20:30:07 +0000 (22:30 +0200)]
avformat/aviobuf: remove uses of deprecated url_feof()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
Michael Niedermayer [Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)]
Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'

* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
  x86: xvid: K&R formatting cosmetics

Conflicts:
libavcodec/x86/xvididct_sse2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
Michael Niedermayer [Wed, 27 Aug 2014 19:09:30 +0000 (21:09 +0200)]
Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'

* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
  cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs

Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'
Michael Niedermayer [Wed, 27 Aug 2014 19:01:42 +0000 (21:01 +0200)]
Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
  x86: xvid_idct: Drop unused definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'
Michael Niedermayer [Wed, 27 Aug 2014 18:51:39 +0000 (20:51 +0200)]
Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'

* commit '404731bd20e1df5880e6fe381e975ba48afc75b2':
  pulse: Set the wallclock option as default

Conflicts:
libavdevice/pulse_audio_dec.c

No change, the option was already default in FFmpeg since a long time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'
Michael Niedermayer [Wed, 27 Aug 2014 18:38:34 +0000 (20:38 +0200)]
Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'

* commit 'ff771f79b55a346b4163d814b58ee4c98114745e':
  vc1: Initialize start_code_found to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/libwebpenc: use WebPMemoryWriterClear()
James Almer [Wed, 27 Aug 2014 18:39:50 +0000 (15:39 -0300)]
lavc/libwebpenc: use WebPMemoryWriterClear()

WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoswr: aarch64 audio_convert and neon clobber test
Michael Niedermayer [Sun, 24 Aug 2014 15:09:45 +0000 (17:09 +0200)]
swr: aarch64 audio_convert and neon clobber test

Ported from avresample
Code by:  Mans Rullgard, Janne Grunau, Martin Storsjo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobktr: Fix Fabrice's name
Timothy Gu [Tue, 26 Aug 2014 23:13:52 +0000 (16:13 -0700)]
bktr: Fix Fabrice's name

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This file with the incorrect name was added after the name was fixed in all other files.
This is thus fixing a mistake

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mp3enc: don't abort if audio packets can't be buffered
James Almer [Wed, 27 Aug 2014 00:31:14 +0000 (21:31 -0300)]
lavf/mp3enc: don't abort if audio packets can't be buffered

Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agox86: xvid: K&R formatting cosmetics
Diego Biurrun [Wed, 27 Aug 2014 00:58:08 +0000 (02:58 +0200)]
x86: xvid: K&R formatting cosmetics

5 years agoImproved AC3 decoder level support (heavy drc, dialnorm)
Jean-Francois Thibert [Tue, 26 Aug 2014 23:16:06 +0000 (19:16 -0400)]
Improved AC3 decoder level support (heavy drc, dialnorm)

Added support for AC3 heavy dynamic range compression used
to restrict the output range and added a setting to specify
the output target level and use the dialog normalization
field to apply it in the digital domain.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: reduce diff to libav in opt_target() by 16 lines
Michael Niedermayer [Wed, 27 Aug 2014 11:13:51 +0000 (13:13 +0200)]
ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Diego Biurrun [Wed, 27 Aug 2014 00:58:07 +0000 (02:58 +0200)]
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs

5 years agox86: xvid_idct: Drop unused definitions
Diego Biurrun [Wed, 27 Aug 2014 00:58:06 +0000 (02:58 +0200)]
x86: xvid_idct: Drop unused definitions

5 years agoMerge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
Michael Niedermayer [Wed, 27 Aug 2014 10:52:34 +0000 (12:52 +0200)]
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'

* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1688eef25385089026aba55da1885f70a57815ab'
Michael Niedermayer [Wed, 27 Aug 2014 10:38:53 +0000 (12:38 +0200)]
Merge commit '1688eef25385089026aba55da1885f70a57815ab'

* commit '1688eef25385089026aba55da1885f70a57815ab':
  avconv: fix the muxrate values for -target

Conflicts:
ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopulse: Set the wallclock option as default
Luca Barbato [Sun, 24 Aug 2014 12:13:45 +0000 (14:13 +0200)]
pulse: Set the wallclock option as default

5 years agovc1: Initialize start_code_found to 0
Luca Barbato [Wed, 27 Aug 2014 00:50:58 +0000 (02:50 +0200)]
vc1: Initialize start_code_found to 0

Leftover of a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e.

5 years agoMerge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'
Michael Niedermayer [Wed, 27 Aug 2014 10:00:10 +0000 (12:00 +0200)]
Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'

* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
  mpegenc: limit the maximum muxrate

Conflicts:
libavformat/mpegenc.c

See: 28d35dbe9f570025c220c08997bc11e21b3c1a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavconv: fix parsing the AVOptions for -target
Anton Khirnov [Tue, 26 Aug 2014 06:26:35 +0000 (06:26 +0000)]
avconv: fix parsing the AVOptions for -target

CC: libav-stable@libav.org
5 years agoavconv: fix the muxrate values for -target
Anton Khirnov [Mon, 25 Aug 2014 21:24:35 +0000 (21:24 +0000)]
avconv: fix the muxrate values for -target

The mpegenc private option values are in 50-byte units.

CC: libav-stable@libav.org
5 years agompegenc: limit the maximum muxrate
Anton Khirnov [Mon, 25 Aug 2014 21:21:57 +0000 (21:21 +0000)]
mpegenc: limit the maximum muxrate

It is written to the file as a 22-bit value.

CC: libav-stable@libav.org
5 years agoavformat/mxfenc: dont warn about d10_channelcount being ignored if its not set
Michael Niedermayer [Fri, 22 Aug 2014 20:36:55 +0000 (22:36 +0200)]
avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'
Michael Niedermayer [Tue, 26 Aug 2014 20:01:45 +0000 (22:01 +0200)]
Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'

* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
  h264: fully check cropping amount from sps

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
Michael Niedermayer [Tue, 26 Aug 2014 19:45:39 +0000 (21:45 +0200)]
Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'

* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
Michael Niedermayer [Tue, 26 Aug 2014 18:48:07 +0000 (20:48 +0200)]
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'

* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
  doc: fix a typo

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'
Michael Niedermayer [Tue, 26 Aug 2014 18:40:34 +0000 (20:40 +0200)]
Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'

* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_h261: Fix sanity checks
ThomasVolkert [Tue, 26 Aug 2014 12:23:00 +0000 (14:23 +0200)]
avformat/rtpdec_h261: Fix sanity checks

Fixes mbap and quant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx264: fix -b_qfactor and -chromaoffset
Hii [Tue, 26 Aug 2014 06:55:14 +0000 (14:55 +0800)]
libx264: fix -b_qfactor and -chromaoffset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: fully check cropping amount from sps
Vittorio Giovara [Tue, 26 Aug 2014 00:40:19 +0000 (20:40 -0400)]
h264: fully check cropping amount from sps

Even if sps.crop is true, the cropping amount may be zero.
Fixes a sample with a valid but broken container cropping.

5 years agolibxvid: K&R formatting cosmetics
Gabriel Dume [Wed, 20 Aug 2014 21:25:21 +0000 (17:25 -0400)]
libxvid: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodoc: fix a typo
Gabriel Dume [Mon, 25 Aug 2014 19:28:02 +0000 (15:28 -0400)]
doc: fix a typo

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoos_support: Adjust an outdated #endif comment
Diego Biurrun [Fri, 15 Aug 2014 07:46:03 +0000 (09:46 +0200)]
os_support: Adjust an outdated #endif comment

5 years agoavformat/utils: remove assert that tests the same condition as the if() directly...
Michael Niedermayer [Tue, 26 Aug 2014 13:23:23 +0000 (15:23 +0200)]
avformat/utils: remove assert that tests the same condition as the if() directly above

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nsvdec: fix out-commented asserts so the function names exist
Michael Niedermayer [Tue, 26 Aug 2014 13:21:25 +0000 (15:21 +0200)]
avformat/nsvdec: fix out-commented asserts so the function names exist

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove out-commented assert
Michael Niedermayer [Tue, 26 Aug 2014 13:20:58 +0000 (15:20 +0200)]
avcodec/snowenc: remove out-commented assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'
Michael Niedermayer [Tue, 26 Aug 2014 12:04:39 +0000 (14:04 +0200)]
Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'

* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'
Michael Niedermayer [Tue, 26 Aug 2014 10:40:32 +0000 (12:40 +0200)]
Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'

* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
  vc1: Fix the skip condition

Conflicts:
libavcodec/vc1_parser.c

See: ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'
Michael Niedermayer [Tue, 26 Aug 2014 10:05:20 +0000 (12:05 +0200)]
Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'

* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734':
  vfwcap: Add fallback define for HWND_MESSAGE

The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
    commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2
        vfwcap: Drop fallback VfW defines
        The defines were added long ago when MinGW still lacked them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: update libvpx_vp9_encoder check
James Almer [Tue, 26 Aug 2014 03:24:39 +0000 (00:24 -0300)]
configure: update libvpx_vp9_encoder check

Required to add support for the aq_mode setting.
Any libvpx snapshot prior to 1.3.0 is not recommended for vp9 encoding for that matter.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agompeg: Write H264 streams at offset 2
Luca Barbato [Fri, 8 Aug 2014 11:05:12 +0000 (13:05 +0200)]
mpeg: Write H264 streams at offset 2

It hints that the content is H264 according to HD-DVD.

5 years agovc1: Fix the skip condition
Luca Barbato [Sun, 24 Aug 2014 17:34:13 +0000 (19:34 +0200)]
vc1: Fix the skip condition

As written in the comment above, skip must be added only if a
start code is found.

5 years agoavformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing
ThomasVolkert [Mon, 25 Aug 2014 22:51:59 +0000 (00:51 +0200)]
avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing

5 years agovfwcap: Add fallback define for HWND_MESSAGE
Diego Biurrun [Mon, 25 Aug 2014 15:26:15 +0000 (17:26 +0200)]
vfwcap: Add fallback define for HWND_MESSAGE

Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.

5 years agodoc/snow: remove possibly wrong todo item
Michael Niedermayer [Mon, 25 Aug 2014 22:27:28 +0000 (00:27 +0200)]
doc/snow: remove possibly wrong todo item

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: use av_malloc_array()
Michael Niedermayer [Mon, 25 Aug 2014 16:32:53 +0000 (18:32 +0200)]
ffplay: use av_malloc_array()

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/ftp: Do not leak memory in routine ftp_features
Alexander Strasser [Tue, 19 Aug 2014 22:41:55 +0000 (00:41 +0200)]
libavformat/ftp: Do not leak memory in routine ftp_features

Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)

OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
5 years agohuffyuvdec: decode the last odd sample
Christophe Gisquet [Mon, 25 Aug 2014 20:24:30 +0000 (20:24 +0000)]
huffyuvdec: decode the last odd sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuvenc: write last odd sample
Christophe Gisquet [Mon, 25 Aug 2014 20:24:29 +0000 (20:24 +0000)]
huffyuvenc: write last odd sample

If width is odd, last sample wouldn't be written.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp9: Use av_malloc_array()
Michael Niedermayer [Mon, 25 Aug 2014 16:33:11 +0000 (18:33 +0200)]
avcodec/vp9: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroskadec: Ensure cues_end is initialized
Vignesh Venkatasubramanian [Mon, 25 Aug 2014 16:15:13 +0000 (09:15 -0700)]
lavf/matroskadec: Ensure cues_end is initialized

Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.

This fixes coverity defect CID1231991.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opencl: use av_malloc(z)_array()
Michael Niedermayer [Mon, 25 Aug 2014 14:06:10 +0000 (16:06 +0200)]
avutil/opencl: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbisenc: use av_malloc(z)_array()
Michael Niedermayer [Mon, 25 Aug 2014 14:03:54 +0000 (16:03 +0200)]
avcodec/vorbisenc: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in dates and hashes
Michael Niedermayer [Mon, 25 Aug 2014 13:57:37 +0000 (15:57 +0200)]
doc/APIchanges: fill in dates and hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2
Michael Niedermayer [Wed, 20 Aug 2014 18:01:40 +0000 (20:01 +0200)]
avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2

Fixes bitrate detection in CBR mpeg2
Fixes ticket3678

5 years agoMerge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
Michael Niedermayer [Mon, 25 Aug 2014 11:26:42 +0000 (13:26 +0200)]
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'

* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
  libavformat: use MSG_NOSIGNAL when applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
Michael Niedermayer [Mon, 25 Aug 2014 10:27:19 +0000 (12:27 +0200)]
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'

* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'
Michael Niedermayer [Mon, 25 Aug 2014 10:09:29 +0000 (12:09 +0200)]
Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'

* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat: use MSG_NOSIGNAL when applicable
Rémi Denis-Courmont [Wed, 20 Aug 2014 20:06:07 +0000 (23:06 +0300)]
libavformat: use MSG_NOSIGNAL when applicable

If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.

Signed-off-by: Martin Storsjö <martin@martin.st>