* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
h264: reset ret to avoid propagating minor failures
See: 47048aa30b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a':
Update default FATE URL for release/11
Conflicts:
tests/Makefile
no change, as we do not have per release reference samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61af6bebb4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
in the latest git commits of libilbc developers removed WebRtc_xxx typedefs
This commit uses int types instead,
it's safe to apply also for previous versions since
WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59af5383c1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See https://code.google.com/p/webp/issues/detail?id=206
for a description of the problem/fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This patch makes the decoder follow the recommendation of the spec.
There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp")
about what would be best to be written in the spec, so in case the spec
is changed again, this potentially would need to be amended or reverted
(cherry picked from commit 4fd21d58a7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.
This fixes building on powerpc/ppc64el.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 739f179dd6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.
(cherry picked from commit c5560e72d0)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a99134f1a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes Ticket3883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b227be34db)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dst_file cannot be NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68bca03951)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit da2186be81)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4': (26 commits)
Prepare for 11 release
doc: Fix syntax and logical errors in avconv stream combination example
Fix RELEASE identification
Mark 11 release in the changelog
Add release notes for 11.
avcodec: fix missing doxygen comment marker
Prepare for 11_beta2 Release
license: Mention that vf_interlace is GPL, not LGPL
matroskaenc: convert avstream stereo3d side data during encoding
matroskadec: parse stereo mode on decoding
avcodec: add stream-level stereo3d side data
matroska: list supported extensions
doc/APIchanges: fill in missing hashes and dates
pulse: Add a wallclock option to be compatible with other other captures
vc1: Initialize start_code_found to 0
avconv: fix parsing the AVOptions for -target
avconv: fix the muxrate values for -target
mpegenc: limit the maximum muxrate
vc1: Fix the skip condition
vfwcap: Add fallback define for HWND_MESSAGE
...
Conflicts:
Changelog
LICENSE.md
RELEASE
doc/APIchanges
doc/RELEASE_NOTES
doc/ffmpeg.texi
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/error_resilience.c
libavcodec/utils.c
libavcodec/vc1_parser.c
libavcodec/version.h
libavdevice/pulse_audio_dec.c
libavfilter/setpts.c
libavfilter/src_movie.c
libavformat/electronicarts.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mpegenc.c
Merge for metadata only, all these backports are already present in
release/2.4 as its branched off from master at a later point so that
all these changes where in master already.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bernd Kuhls
Michael Niedermayer
Luca Barbato
Rémi Denis-Courmont
Gianluigi Tiesi
Pascal Massimino
Andreas Cadhalpun
Diego Biurrun
Katerina Barone-Adesi
Clément Bœsch
Reynaldo H. Verdejo Pinochet
Clément Bœsch