]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:33:28 +0000 (12:33 +0200)]
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Diego Biurrun [Wed, 27 Aug 2014 11:14:20 +0000 (13:14 +0200)]
license: Mention that vf_interlace is GPL, not LGPL
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.
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
Vittorio Giovara [Wed, 23 Jul 2014 08:21:28 +0000 (09:21 +0100)]
avcodec: add stream-level stereo3d side data
Vittorio Giovara [Wed, 23 Jul 2014 08:49:24 +0000 (09:49 +0100)]
matroska: list supported extensions
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>
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>
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>
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>
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>
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>
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>
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>
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>
Stefano Sabatini [Thu, 28 Aug 2014 10:19:33 +0000 (12:19 +0200)]
doc/ffprobe: fix -show_entries example
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>
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".
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Diego Biurrun [Wed, 27 Aug 2014 00:58:08 +0000 (02:58 +0200)]
x86: xvid: K&R formatting cosmetics
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>
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>
Diego Biurrun [Wed, 27 Aug 2014 00:58:07 +0000 (02:58 +0200)]
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Diego Biurrun [Wed, 27 Aug 2014 00:58:06 +0000 (02:58 +0200)]
x86: xvid_idct: Drop unused definitions
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>
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>
Luca Barbato [Sun, 24 Aug 2014 12:13:45 +0000 (14:13 +0200)]
pulse: Set the wallclock option as default
Luca Barbato [Wed, 27 Aug 2014 00:50:58 +0000 (02:50 +0200)]
vc1: Initialize start_code_found to 0
Leftover of
a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e .
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>
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
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
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
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
Diego Biurrun [Fri, 15 Aug 2014 07:46:03 +0000 (09:46 +0200)]
os_support: Adjust an outdated #endif comment
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>
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>
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>
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>
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>
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>
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>
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.
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.
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
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.
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>
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>
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>
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>
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>
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>
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>