ab02548c8a
Merge commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5' into release/2.4
...
* commit 'b45ab61b24a8f2aeafdd4451491b1b30b7875ee5':
apetag: Fix APE tag size check
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-18 01:04:25 +02:00
b45ab61b24
apetag: Fix APE tag size check
...
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 c5560e72d0diego@biurrun.de >
2014-09-17 07:07:22 -07:00
cc73b4f574
tools/crypto_bench: fix build when AV_READ_TIME is unavailable
...
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 4a99134f1amichaelni@gmx.at >
2014-09-16 18:27:33 +02:00
8ac3b2cdb7
RELEASE_NOTES: add H.261 & HEVC RTP support
...
Suggested-by: Thomas Volkert <silvo@gmx.net >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-16 11:34:50 +02:00
ace90ee265
avcodec/mjpegenc: the AMV encoder doesnt support yuv422
...
Fixes Ticket3883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit b227be34dbmichaelni@gmx.at >
2014-09-14 17:46:33 +02:00
703bd31647
Changelog: add 2.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 808db3e687michaelni@gmx.at >
2014-09-14 16:53:20 +02:00
c16e80ee3d
doc/examples: remove unneeded NULL checks
...
dst_file cannot be NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
(cherry picked from commit 68bca03951michaelni@gmx.at >
2014-09-14 16:53:19 +02:00
66ac5b96e8
MAINTAINERS: Add 2.4 to maintained releases, drop 2.3
...
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 da2186be81michaelni@gmx.at >
2014-09-14 16:00:15 +02:00
547cad8c81
Merge commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4' into release/2.4
...
* 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 >
2014-09-14 15:57:32 +02:00
55b1a1e9c1
update for 2.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 15:37:11 +02:00
5eef7042d8
Changelog/RELEASE_NOTES: prepare for 2.4
2014-09-14 13:41:49 +02:00
fa1b563196
doc/APIchanges: Update hashes and dates
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 12:45:36 +02:00
b97e27082b
doc/APIchanges: attempt to split releases
...
Based on several git show origin/release/X.Y:doc/APIchanges.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 12:44:06 +02:00
365b9cf624
doc: mention important API changes in the RELEASE_NOTES
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 03:09:35 +02:00
2638af2fc5
ffserver: drop custom skip_spaces() impl
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2014-09-13 21:01:01 -03:00
4c8be331bc
ffserver: use correct error for stream not found
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com >
2014-09-13 21:01:01 -03:00
8f537420ae
doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 01:13:25 +02:00
5312fb13b4
RELEASE_NOTES: add version numbers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-14 00:14:58 +02:00
c2a7607a1c
RELEASE_NOTES: Add next versions name (Fresnel)
...
The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 23:51:00 +02:00
36ea35bbc0
avformat/utils: free s->pb for image2 as it can be used with and without a file
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 23:25:17 +02:00
89d42da5c6
avformat/assenc: honor ReadOrder
2014-09-13 23:02:51 +02:00
52c85b194b
avdevice/lavfi: dont assign variables to themselfs
...
Fixes "warning: explicitly assigning a variable of type int to itself"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 22:32:21 +02:00
8407cbbfc9
Fix "passing argument 1 of av_free discards const qualifier from pointer target type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 22:32:20 +02:00
296cd9c432
avformat/mpegts: Improve probe heuristic by considering the overall frequency of 0x47 headers
...
Fixes Ticket3939
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 22:08:21 +02:00
b96d864fd6
avcodec/mjpegdec: Fix chroma width rounding
...
Fixes vertical line at the right side
Fixes Ticket 3929
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 20:25:27 +02:00
f851477889
Prepare for 11 release
2014-09-13 11:14:46 -07:00
ceb2fe027f
avcodec/bmp_parser: delay frame end detection to the next header or EOF
...
Fixes Ticket3687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 17:46:18 +02:00
3c6d824b80
avcodec/bmp_parser: simplify
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 17:21:31 +02:00
b11d1889ef
avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 17:10:13 +02:00
d86cf4a91d
avformat/vobsub: fix NULL dereference
2014-09-13 15:15:32 +02:00
8572dbc5db
avcodec/ac3en: use FF_ALLOC(Z)_ARRAY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 13:28:38 +02:00
bcac0f4010
lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 00:37:35 +02:00
d5e802609a
doc: document the addition of the AVProbeData.mime_type field and it's implications
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-13 00:36:14 +02:00
cdb3eee7c4
configure: Fix miscompilation for i586
...
If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-12 22:57:31 +02:00
b3fd2b175c
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.
...
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 >
2014-09-12 19:01:44 +02:00
917d14e6a2
avformat/format: Run image2 probe again when file content data is available
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-12 18:20:38 +02:00
321c3cd1a9
avformat/img2dec: reduce bmppipe probe score
...
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 >
2014-09-12 18:19:11 +02:00
e3fb2b0eb7
docs: add example around the suggested commit message format
...
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 >
2014-09-12 01:59:44 +02:00
453944cc77
configure: fix check_cmd in check_host_cpp
...
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 >
2014-09-11 18:42:23 +02:00
8e8db16a2c
avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 18:36:34 +02:00
4a203b7737
avcodec/png_parser: Return the buffered data at the end
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 16:47:01 +02:00
a6153bde3d
avcodec/pngdec: print the actual number of bytes left in the error case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 16:47:01 +02:00
de4a4ca1a0
avformat/img2_alias_pix: Add AVClass and image2 AVOptions
...
This fixes the default timebase and allows overriding the framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 15:34:13 +02:00
8b4714614f
avformat/img2_alias & brender_pix: fix function names
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 15:16:24 +02:00
646d663f71
avformat/img2_brender_pix: Add AVClass and image2 AVOptions
...
This fixes the default timebase and allows overriding the framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 15:10:59 +02:00
5303a644f5
avformat/img2: Make AVOptions available to img* demuxers defined in other files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 15:10:15 +02:00
ea7ebadeb7
avformat/rmdec: very basic MLTI support
...
Fixes Ticket2152
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 14:13:03 +02:00
16de4d927e
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters
...
Fixes Ticket3562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 04:55:58 +02:00
5e3da25618
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
...
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-11 01:27:38 +02:00
3e56ae67d3
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-09-10 22:37:35 +02:00
Michael Niedermayer