ffmpeg.git
5 years agoMerge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
Michael Niedermayer [Mon, 1 Sep 2014 18:51:31 +0000 (20:51 +0200)]
Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

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

* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
libavcodec/dxva2.h

See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'
Michael Niedermayer [Mon, 1 Sep 2014 18:29:38 +0000 (20:29 +0200)]
Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'

* commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c

See: 64c53fa16aeca9cadd48ccf607803d6e4d26cc4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Enable compute_edt only when the subtitles are used for a output stream inste...
Michael Niedermayer [Mon, 1 Sep 2014 02:13:49 +0000 (04:13 +0200)]
ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter

Fixes/works around Ticket3768

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: make compute_edt user settable
Michael Niedermayer [Mon, 1 Sep 2014 02:13:48 +0000 (04:13 +0200)]
avcodec/dvbsubdec: make compute_edt user settable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh261dec, ituh263dec: Move condition.
Reimar Döffinger [Sun, 31 Aug 2014 21:01:09 +0000 (23:01 +0200)]
h261dec, ituh263dec: Move condition.

Stops compiler from doing incredibly stupid things.
With vsynth1-flv inner loop goes from 3501 to 3275
decicycles.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.
Reimar Döffinger [Sun, 31 Aug 2014 19:39:22 +0000 (21:39 +0200)]
h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.
Reimar Döffinger [Sun, 31 Aug 2014 18:30:04 +0000 (20:30 +0200)]
h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.

3646 -> 3597 decicycles in inner loop when decoding
vsynth1-flv.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agogeneral: Fix usage of @float
Timothy Gu [Mon, 1 Sep 2014 02:42:50 +0000 (19:42 -0700)]
general: Fix usage of @float

makeinfo chokes on that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaac_adtstoasc_bsf: Return proper error code
Gabriel Dume [Sat, 30 Aug 2014 02:43:43 +0000 (22:43 -0400)]
aac_adtstoasc_bsf: Return proper error code

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodxva2: Clean up definition of _WIN32_WINNT
Diego Biurrun [Fri, 15 Aug 2014 19:01:15 +0000 (21:01 +0200)]
dxva2: Clean up definition of _WIN32_WINNT

Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is
cleaner than unconditional definition and avoids a number of redefinition
warnings. Also only define a value in one of the two dxva2 headers.

5 years agodxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()
Diego Biurrun [Fri, 15 Aug 2014 18:51:01 +0000 (20:51 +0200)]
dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

This avoids related incompatible pointer type warnings.

5 years agoRELEASE_NOTES: mention libmodplug detection change
Clément Bœsch [Mon, 1 Sep 2014 09:36:02 +0000 (11:36 +0200)]
RELEASE_NOTES: mention libmodplug detection change

5 years agolavu/avstring: check for overlong encodings in av_utf8_decode()
Stefano Sabatini [Thu, 28 Aug 2014 15:37:27 +0000 (17:37 +0200)]
lavu/avstring: check for overlong encodings in av_utf8_decode()

Fix reopened trac ticket #1163.

5 years agobuild: use pkg-config to detect libmodplug
Clément Bœsch [Mon, 1 Sep 2014 06:58:50 +0000 (08:58 +0200)]
build: use pkg-config to detect libmodplug

Fix static build, at least for OSX.

5 years agoMerge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'
Michael Niedermayer [Mon, 1 Sep 2014 02:19:08 +0000 (04:19 +0200)]
Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

See: 22652dc2b8d61d6a48e3f7815fa7f4b0adf0f12f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: favor DESC_types over probed codecs
Michael Niedermayer [Mon, 1 Sep 2014 01:15:55 +0000 (03:15 +0200)]
avformat/mpegts: favor DESC_types over probed codecs

Fixes Ticket3766
Fixes dvb_teletext detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix missing doxygen comment marker
Michael Niedermayer [Sun, 31 Aug 2014 23:48:50 +0000 (00:48 +0100)]
avcodec: fix missing doxygen comment marker

5 years agoffserver: tests, use image2 instead of pgmyuv
Reynaldo H. Verdejo Pinochet [Mon, 25 Aug 2014 16:24:02 +0000 (12:24 -0400)]
ffserver: tests, use image2 instead of pgmyuv

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoituh263dec: Optimize new RL_VLC based decoding.
Reimar Döffinger [Sun, 31 Aug 2014 13:41:36 +0000 (15:41 +0200)]
ituh263dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in
a speedup of about 30% in this inner loop.
Overall speedup only relevant for medium to high bitrate
streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec: Optimize new RL_VLC based decoding.
Reimar Döffinger [Sun, 31 Aug 2014 13:41:13 +0000 (15:41 +0200)]
h261dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in about
10% speedup for this inner loop.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261, h263 decoders: convert to RL_VLC.
Reimar Döffinger [Sun, 31 Aug 2014 12:20:23 +0000 (14:20 +0200)]
h261, h263 decoders: convert to RL_VLC.

Some additional optimizations in following patch.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoaacps_tablegen: replace TABLE_CONST by const.
Reimar Döffinger [Sun, 31 Aug 2014 10:41:11 +0000 (12:41 +0200)]
aacps_tablegen: replace TABLE_CONST by const.

Doesn't change generated code, just is more consistent
and a bit less error-prone.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agointmath.h: Remove duplicated ARM include.
Reimar Döffinger [Sun, 31 Aug 2014 10:28:45 +0000 (12:28 +0200)]
intmath.h: Remove duplicated ARM include.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/mjpegdec: fix green line at the bottom with upscale v
Michael Niedermayer [Sun, 31 Aug 2014 13:33:30 +0000 (15:33 +0200)]
avcodec/mjpegdec: fix green line at the bottom with upscale v

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix green vertical line at the right with upscale h
Michael Niedermayer [Sun, 31 Aug 2014 12:42:53 +0000 (14:42 +0200)]
avcodec/mjpegdec: fix green vertical line at the right with upscale h

Fixes Ticket3891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_drawtext: move "static const" before "struct".
Reimar Döffinger [Sun, 31 Aug 2014 08:40:39 +0000 (10:40 +0200)]
vf_drawtext: move "static const" before "struct".

This is consistent with all other occurrences.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agolavu/hash.c: Add missing "static const".
Reimar Döffinger [Fri, 29 Aug 2014 16:34:28 +0000 (18:34 +0200)]
lavu/hash.c: Add missing "static const".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoAdd av_cold to table generation functions.
Reimar Döffinger [Sat, 30 Aug 2014 15:35:18 +0000 (17:35 +0200)]
Add av_cold to table generation functions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoWMA: add "const" to avoid warnings with hardcoded tables.
Reimar Döffinger [Sat, 30 Aug 2014 15:58:51 +0000 (17:58 +0200)]
WMA: add "const" to avoid warnings with hardcoded tables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoac3dec_fixed: add missing "static const".
Reimar Döffinger [Fri, 29 Aug 2014 16:50:53 +0000 (18:50 +0200)]
ac3dec_fixed: add missing "static const".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agolavfi: add const/static const to pix_fmts arrays.
Reimar Döffinger [Fri, 29 Aug 2014 16:42:47 +0000 (18:42 +0200)]
lavfi: add const/static const to pix_fmts arrays.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agosipr16kdata.h: add forgotten const.
Reimar Döffinger [Fri, 29 Aug 2014 16:40:14 +0000 (18:40 +0200)]
sipr16kdata.h: add forgotten const.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agofft_template: Move variables to where they are used.
Reimar Döffinger [Fri, 29 Aug 2014 16:32:20 +0000 (18:32 +0200)]
fft_template: Move variables to where they are used.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agofft: add ff_ prefix to some global arrays.
Reimar Döffinger [Fri, 29 Aug 2014 16:26:57 +0000 (18:26 +0200)]
fft: add ff_ prefix to some global arrays.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/h264: Do not get stuck on IDR inter frames
Michael Niedermayer [Sun, 31 Aug 2014 01:43:56 +0000 (03:43 +0200)]
avcodec/h264: Do not get stuck on IDR inter frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoxv.c: Add missing const to lookup table.
Reimar Döffinger [Fri, 29 Aug 2014 16:44:22 +0000 (18:44 +0200)]
xv.c: Add missing const to lookup table.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavformat/dfa: use avio_feof()
Paul B Mahol [Sun, 24 Aug 2014 14:28:02 +0000 (14:28 +0000)]
avformat/dfa: use avio_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agooggdec: fix invalid free on error
wm4 [Sat, 30 Aug 2014 13:39:15 +0000 (15:39 +0200)]
oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft: add missing const.
Reimar Döffinger [Fri, 29 Aug 2014 16:23:52 +0000 (18:23 +0200)]
fft: add missing const.

This table was the largest object in FFmpeg's .data,
and really should be in .rodata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 30 Aug 2014 12:38:40 +0000 (14:38 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoproresenc_ks: allow auto-selecting profile
Christophe Gisquet [Mon, 18 Aug 2014 09:27:50 +0000 (11:27 +0200)]
proresenc_ks: allow auto-selecting profile

The user may not know how to select the profile, nor what he needs, in
particular to encode alpha.

Therefore, use an automatic selection as default, and warn when the
manually selected profile may cause issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp3data: use more compact data types
Michael Niedermayer [Sat, 30 Aug 2014 03:10:26 +0000 (05:10 +0200)]
avcodec/vp3data: use more compact data types

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/rtpdec_hevc: Fix compilation with -DDEBUG.
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:33:28 +0000 (12:33 +0200)]
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.

5 years agoffmpeg: Clean up if filter initialisation failed to avoid a memleak.
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:27:50 +0000 (12:27 +0200)]
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Fixes ticket #3858.

Reviewed-by: Nicolas George
5 years agoavcodec/aarch64/h264qpel_init_aarch64: mark src as const
Michael Niedermayer [Sat, 30 Aug 2014 10:48:31 +0000 (12:48 +0200)]
avcodec/aarch64/h264qpel_init_aarch64: mark src as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if
Michael Niedermayer [Sat, 30 Aug 2014 10:42:16 +0000 (12:42 +0200)]
avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is...
Michael Niedermayer [Sat, 30 Aug 2014 10:21:07 +0000 (12:21 +0200)]
avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>