Michael Niedermayer
7771daaea7
Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'
...
* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
license: Mention that vf_interlace is GPL, not LGPL
Conflicts:
LICENSE.md
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 01:08:57 +02:00
Michael Niedermayer
39cd9fdbf8
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
...
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
matroskaenc: convert avstream stereo3d side data during encoding
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 00:44:47 +02:00
Michael Niedermayer
fcc3909908
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
...
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:48:23 +02:00
Michael Niedermayer
31f9c228c0
ffmpeg: Fix missing {} in Stream to Packet side data code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:34:20 +02:00
Michael Niedermayer
f30a8154ab
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>
2014-08-28 22:23:01 +02:00
Michael Niedermayer
56cc754c76
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'
...
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
matroska: list supported extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:12:36 +02:00
Michael Niedermayer
c6a3b00924
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>
2014-08-28 22:06:48 +02:00
Michael Niedermayer
1fc3963188
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
...
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
x11grab: Drop a spurious space in the extension reporting message
Conflicts:
libavdevice/x11grab.c
See: 9af2097120
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:51:34 +02:00
Michael Niedermayer
65c9e2d003
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
...
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
x11grab: Small near-cosmetic refactorings
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:39:19 +02:00
Michael Niedermayer
5393c9dadd
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
...
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
x11grab: K&R formatting cosmetics
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:21:47 +02:00
Diego Biurrun
9e8bbe7d4d
license: Mention that vf_interlace is GPL, not LGPL
2014-08-28 19:47:43 +02:00
Vittorio Giovara
4d686fb721
matroskaenc: convert avstream stereo3d side data during encoding
...
Write the StereoMode Embl to bitstream.
2014-08-28 12:35:27 -04:00
Vittorio Giovara
d4ae8ac92f
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
2014-08-28 12:33:26 -04:00
Vittorio Giovara
9301486408
avcodec: add stream-level stereo3d side data
2014-08-28 12:33:26 -04:00
Vittorio Giovara
f2583bc86e
matroska: list supported extensions
2014-08-28 12:33:25 -04:00
Paul B Mahol
0ddb0516f1
avformat/soxenc: return more meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-28 15:52:25 +00:00
Michael Niedermayer
ef768ab976
avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 16:03:28 +02:00
Michael Niedermayer
87961a8a50
avcodec/flashsv2enc: fix "unused variable" warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 15:50:35 +02:00
Luca Barbato
58396e806c
x11grab: Use a typedef for the context, as most other code does
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:49:05 +02:00
Luca Barbato
7bb505a33c
x11grab: Drop a spurious space in the extension reporting message
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:46:56 +02:00
Deb Mukherjee
b543a29020
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>
2014-08-28 15:21:57 +02:00
Luca Barbato
20e82b41fc
x11grab: Small near-cosmetic refactorings
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:20:12 +02:00
Luca Barbato
f07a4290a0
x11grab: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 14:58:48 +02:00
Michael Niedermayer
d6bd29492c
avformat/icoenc: Remove deprecated use of codec_name
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 14:34:55 +02:00
Stefano Sabatini
fa39f8c0e2
doc/ffprobe: fix -show_entries example
2014-08-28 12:20:18 +02:00
Deb Mukherjee
b6a0b8bcf4
Adds support for setting aq_mode in libvpx encoder
...
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-08-27 23:12:47 -03:00
James Darnley
8c1b942ad7
Replace incorrect use of "multiply" with "multiple"
...
Also replace the plural form "multiplies" with "multiples".
2014-08-27 16:00:17 -08:00
Michael Niedermayer
e6516944a3
avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 23:53:53 +02:00
Michael Niedermayer
35debfc366
avformat/rdt: fix compiler warning about const qualifier being discarded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 23:52:40 +02:00
Michael Niedermayer
7a2c380e93
avformat/aviobuf: remove uses of deprecated url_feof()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 22:30:07 +02:00
Michael Niedermayer
5403a288a7
Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
...
* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
x86: xvid: K&R formatting cosmetics
Conflicts:
libavcodec/x86/xvididct_sse2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 21:20:39 +02:00
Michael Niedermayer
b3b05a11d3
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>
2014-08-27 21:09:30 +02:00
Michael Niedermayer
3ff5ca89fc
Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'
...
* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
x86: xvid_idct: Drop unused definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 21:01:54 +02:00
Michael Niedermayer
42196083fe
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>
2014-08-27 20:51:39 +02:00
Michael Niedermayer
a59d922d24
Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'
...
* commit 'ff771f79b55a346b4163d814b58ee4c98114745e':
vc1: Initialize start_code_found to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 20:44:40 +02:00
James Almer
7997d78643
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>
2014-08-27 15:42:13 -03:00
Michael Niedermayer
7c51f5bd39
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>
2014-08-27 20:06:37 +02:00
Timothy Gu
25cb697d0c
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>
2014-08-27 19:17:58 +02:00
James Almer
d3e9bee6f7
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>
2014-08-27 13:51:34 -03:00
Diego Biurrun
8d27bf1cff
x86: xvid: K&R formatting cosmetics
2014-08-27 05:58:04 -07:00
Jean-Francois Thibert
12df9b9a15
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>
2014-08-27 14:31:39 +02:00
Michael Niedermayer
7a67ab5cba
ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 14:27:30 +02:00
Diego Biurrun
dcb7c868ec
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
2014-08-27 04:54:05 -07:00
Diego Biurrun
1f156af427
x86: xvid_idct: Drop unused definitions
2014-08-27 04:36:41 -07:00
Michael Niedermayer
2082c00ea2
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
...
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 12:55:31 +02:00
Michael Niedermayer
ad207f1119
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>
2014-08-27 12:38:53 +02:00
Luca Barbato
404731bd20
pulse: Set the wallclock option as default
2014-08-27 12:36:59 +02:00
Luca Barbato
ff771f79b5
vc1: Initialize start_code_found to 0
...
Leftover of a4d3c20035
.
2014-08-27 12:36:41 +02:00
Michael Niedermayer
127aee4ccb
Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'
...
* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
mpegenc: limit the maximum muxrate
Conflicts:
libavformat/mpegenc.c
See: 28d35dbe9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 12:00:10 +02:00
Anton Khirnov
f5245a9c62
avconv: fix parsing the AVOptions for -target
...
CC: libav-stable@libav.org
2014-08-27 06:21:55 +00:00