Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 808db3e68778b77e020aab1b838d32e63a38ae63)
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 68bca03951b36755f46d75a5bcfcbba95ced21c4)
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 da2186be81b5cb2d24da5671e25affbb8f09920d)
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>
Fixes Ticket3901
the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
It gets rendered inline in HTML and becomes not very clear.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Use correct cpp and c flags variables for the host libc.
Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
