]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 4 Nov 2014 21:03:44 +0000 (22:03 +0100)]
Merge commit '
930ffd46e1e742674aa7cc1c2450020c63b5015b '
* commit '
930ffd46e1e742674aa7cc1c2450020c63b5015b ':
aacsbr: change order of operation to prevent out of array read
Conflicts:
libavcodec/aacsbr.c
See:
c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 20:52:58 +0000 (21:52 +0100)]
Merge commit '
9f6f407463ff8b7681befd04b6655bb7c6d9b3e1 '
* commit '
9f6f407463ff8b7681befd04b6655bb7c6d9b3e1 ':
aacsbr: treat 1-d arrays as such
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 20:38:07 +0000 (21:38 +0100)]
Merge commit '
f52b8717617e94da90a45afdfff23e94f9ecf35c '
* commit '
f52b8717617e94da90a45afdfff23e94f9ecf35c ':
celp_filters: don't use filter lenght as loop bound
See:
3f010421421ff0af916cf16313a111dae71f837d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 20:17:29 +0000 (21:17 +0100)]
Merge commit '
c442190a6bfd8036f6c32b78e1e96ff3b830f8f0 '
* commit '
c442190a6bfd8036f6c32b78e1e96ff3b830f8f0 ':
error_resilience: initialize prev_* variables
Note, these variables are not used without initialization prior
to the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 20:09:13 +0000 (21:09 +0100)]
Merge commit '
240b22afe14ef477da1b439b9ed7bca6cc7d6c26 '
* commit '
240b22afe14ef477da1b439b9ed7bca6cc7d6c26 ':
motion_est: remove dead code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 20:01:39 +0000 (21:01 +0100)]
Merge commit '
351d0f8b7a6ecce411ae75fb3511573c34317218 '
* commit '
351d0f8b7a6ecce411ae75fb3511573c34317218 ':
get_bits: remove unused assignment
Conflicts:
libavcodec/get_bits.h
See:
ea6178fff8ee0ccf145a2cbd5ab3c1bf73cd03d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 19:19:04 +0000 (20:19 +0100)]
ffmpeg_opt: store canvas size in decoder context
Fixes canvas size
Fixes Ticket4074
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 18:31:59 +0000 (19:31 +0100)]
avformat/mpegts: fix iteration count in add_pid_to_pmt()
Fixes accessing uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 15:01:07 +0000 (16:01 +0100)]
avfilter/af_aresample: Limit data per inserted packet
This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 15:00:07 +0000 (16:00 +0100)]
avfilter/af_aresample: split flushing code out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 15:54:14 +0000 (16:54 +0100)]
swresample: Fix swr_drop_output so it does not flush the buffers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 00:52:04 +0000 (00:52 +0000)]
aacsbr: change order of operation to prevent out of array read
CC: libav-stable@libav.org
Bug-Id: CID 732250
Benoit Fouet [Tue, 4 Nov 2014 12:54:43 +0000 (13:54 +0100)]
id3v2: prefer TDRC for date over TDRL.
TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
TYER - Year
This frame is replaced by the TDRC frame, 'Recording time'
[F:4.2.5].
So change TDRL usages to TDRC.
Fixes ticket #3694
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 00:18:39 +0000 (01:18 +0100)]
avformat/mpegts: also print PMT version in av_dlog()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 23:35:32 +0000 (00:35 +0100)]
avformat/rtmpproto: Do not fail when the length cannot be determined for live streams
Fixes Ticket4071
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 21:55:07 +0000 (22:55 +0100)]
avformat/mpegts: Continue parsing PMTs during duration estimation
This way if we by chance run into a valid PMT we have a more complete
set of streams, also do not reset streams in case we run into a worse
PMT
Fixes Ticket4046
alternatively Ticket4046 could be closed as invalid or wontfix as it contains
some PMTs which lack the 2 subtitle streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 21:53:48 +0000 (22:53 +0100)]
avformat/utils: Leave skip_clear enabled until after estimate_timings()
Should make no difference but will be needed for subsequent commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 21:23:54 +0000 (22:23 +0100)]
avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Nov 2014 19:28:31 +0000 (20:28 +0100)]
avcodec/libwebpenc: add quality option
previously quality could only be set through qscale/global_quality but the scale
was inverted. Using a separate option avoids the confusion from qscale working
backward.
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 22:45:43 +0000 (23:45 +0100)]
doc: Better documentation for the bitexact flag
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 30 Oct 2014 00:52:03 +0000 (00:52 +0000)]
aacsbr: treat 1-d arrays as such
CC: libav-stable@libav.org
Bug-Id: CID
1238802 / CID
1238793 / CID
1238785
CID
1238808 / CID
1238809
Vittorio Giovara [Thu, 30 Oct 2014 00:51:56 +0000 (00:51 +0000)]
celp_filters: don't use filter lenght as loop bound
CC: libav-stable@libav.org
Bug-Id: CID 717906 / CID 717907 / CID 717916 /
CID 717917 / CID 717919 / CID 732259
Vittorio Giovara [Thu, 30 Oct 2014 00:51:57 +0000 (00:51 +0000)]
error_resilience: initialize prev_* variables
CC: libav-stable@libav.org
Bug-Id: CID 732293 / CID 732294
Michael Niedermayer [Mon, 3 Nov 2014 16:22:33 +0000 (17:22 +0100)]
avfilter/vf_idet: use exp2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 16:22:16 +0000 (17:22 +0100)]
avfilter/vf_idet: use av_rescale()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 16:14:29 +0000 (17:14 +0100)]
avfilter/vf_idet: fix rounding of av_dict_set_fxp()
fixes the remainder overflowing beyond .999
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Mitchell [Mon, 3 Nov 2014 05:30:51 +0000 (21:30 -0800)]
avfilter/vf_idet: add a "half_life" option for statistics
This can be useful for videos in which the interlacing pattern changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 30 Oct 2014 00:51:52 +0000 (00:51 +0000)]
motion_est: remove dead code
mb_type is initialized to 0 and never updated before the check.
Bug-Id: CID
1238782
Vittorio Giovara [Thu, 30 Oct 2014 00:51:51 +0000 (00:51 +0000)]
get_bits: remove unused assignment
Bug-Id: CID
1238816
Benoit Fouet [Mon, 3 Nov 2014 10:04:25 +0000 (11:04 +0100)]
configure: add xcb cflags and extralibs to cflags and extralibs.
Replace xcb_event by xcb, as the former is no more used and the latter
is needed on configurations where only xcb is available, and not
libxcb_shm and/or libxcb_xfixes.
Signed-off-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 12:20:24 +0000 (13:20 +0100)]
avcodec/options_table fix min of audio channels and sample rate
Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Nov 2014 10:52:52 +0000 (11:52 +0100)]
Merge commit '
2f221b6a9365aa400061e16266f2d1242f7169f8 '
* commit '
2f221b6a9365aa400061e16266f2d1242f7169f8 ':
movenc: Define the flag bits using shifts instead of as decimal numbers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 2 Nov 2014 15:01:10 +0000 (17:01 +0200)]
movenc: Define the flag bits using shifts instead of as decimal numbers
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Sun, 2 Nov 2014 23:28:06 +0000 (00:28 +0100)]
lavf/flvenc: fail in case the muxed packet is too big
Avoid the creation of files which cannot be successfully decoded by
ffmpeg, for example generated with:
ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv
Clément Bœsch [Mon, 3 Nov 2014 08:20:27 +0000 (09:20 +0100)]
README: fix 2 typo in the doc/examples sentence
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 01:10:54 +0000 (22:10 -0300)]
ffserver_config: add fixme on buffer_aggressivity/eq deprecation
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 00:56:04 +0000 (21:56 -0300)]
ffserver_config: simplify some if true conditions
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 00:54:23 +0000 (21:54 -0300)]
ffserver_config: fix line lengths
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Carl Eugen Hoyos [Sun, 2 Nov 2014 23:43:08 +0000 (00:43 +0100)]
Silence warnings for fic files with zero-sized cursors.
Fixes ticket #4072.
Carl Eugen Hoyos [Sun, 2 Nov 2014 23:38:13 +0000 (00:38 +0100)]
lavf/movenc: Write G.726 bitrate to make the files decodable.
Fixes ticket #4069.
Lukasz Marek [Sat, 1 Nov 2014 18:17:01 +0000 (19:17 +0100)]
ffserver_config: improve AVOption handing
AVOption are checked right after found in config file.
It allows to report exact line in config file.
Options provided more than once are threated as errors.
It also fixes flag options handing.
Flags may occur more than once in config file.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 1 Nov 2014 01:09:44 +0000 (02:09 +0100)]
ffserver_config: improve error handling
Replace atoi with more advanced parsing routine.
Set maximum port value to 65535 (not 65536).
Other checks.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Sun, 2 Nov 2014 19:09:16 +0000 (20:09 +0100)]
avformat/img2enc: Use localtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 19:08:59 +0000 (20:08 +0100)]
avformat/sbgdec: Use localtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 19:08:12 +0000 (20:08 +0100)]
avformat/wavenc: Use localtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 19:07:34 +0000 (20:07 +0100)]
avformat/segment: use time_internal.h, simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 19:06:08 +0000 (20:06 +0100)]
avcodec/jacosubdec: use time_internal.h, simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 18:20:26 +0000 (19:20 +0100)]
avfilter/vf_drawtext: use gm_time_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 18:19:07 +0000 (19:19 +0100)]
avformat/matroskadec: use gmtime_r() for thread saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 10:43:48 +0000 (11:43 +0100)]
avformat/webpenc: removed unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Nov 2014 00:55:40 +0000 (01:55 +0100)]
avcodec/h264_slice: Clear table pointers to avoid stale pointers
Might fix Ticket3889
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Nov 2014 23:52:29 +0000 (00:52 +0100)]
avformat/img2enc: remove webp extension as we have a dedicated webp muxer
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 1 Nov 2014 01:59:59 +0000 (02:59 +0100)]
ffserver_config: dont pass pointer to enum as pointer to int
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Fri, 31 Oct 2014 15:39:56 +0000 (16:39 +0100)]
avcodec/libwebpenc: support "P" frames in webp animations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 15:10:33 +0000 (16:10 +0100)]
avformat: add webp muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Fri, 31 Oct 2014 01:16:08 +0000 (20:16 -0500)]
avformat/assenc: Add ignore_gaps option
Signed-off-by: Clément Bœsch <u@pkh.me>
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add current frame classification to metadata
Fixes ticket 3832
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add metadata to "current" frame instead of "next" frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Sat, 1 Nov 2014 12:01:53 +0000 (13:01 +0100)]
avformat/rtpdec_h261: code aligned to the HEVC code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 1 Nov 2014 12:01:38 +0000 (13:01 +0100)]
mpeg4vdpau: Fix priv data size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sat, 1 Nov 2014 10:22:06 +0000 (11:22 +0100)]
avcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Nov 2014 09:51:08 +0000 (10:51 +0100)]
avcodec/pthread_frame: Simplify code by using av_reallocp_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Nov 2014 09:50:18 +0000 (10:50 +0100)]
avcodec/parser: use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 1 Nov 2014 01:11:52 +0000 (02:11 +0100)]
ffserver_config: fix compilation warning
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 19 Oct 2014 19:29:40 +0000 (21:29 +0200)]
ffserver_config: postpone codec context creation
So far AVCodecContext was created without codec specified.
This causes internal data to not be initialized to defaults.
This commit postpone context creation until all information is gathered.
Partially fixes #1275
Lukasz Marek [Tue, 26 Aug 2014 18:30:35 +0000 (20:30 +0200)]
lavd/alsa: implement get_device_list callbacks
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Fri, 31 Oct 2014 22:28:45 +0000 (23:28 +0100)]
doc/formats: document libavformats bitexact flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 22:05:02 +0000 (23:05 +0100)]
doc: document -dump_separator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 12:36:19 +0000 (13:36 +0100)]
avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 10:45:21 +0000 (11:45 +0100)]
configure: fix escaping in xcb cflags / libs
Fixes build with open64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 01:51:04 +0000 (02:51 +0100)]
Merge commit '
aae6b3b918b4133b8cc2d1631196c1d406d0351a '
* commit '
aae6b3b918b4133b8cc2d1631196c1d406d0351a ':
movenc: Don't write any iso brands in ismv files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 01:31:59 +0000 (02:31 +0100)]
Merge commit '
c55d1d382cd41345a79782ace41f9b43f45dca9a '
* commit '
c55d1d382cd41345a79782ace41f9b43f45dca9a ':
movenc: Don't write any tfdt atom for ismv files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 01:11:19 +0000 (02:11 +0100)]
Merge commit '
00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73 '
* commit '
00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73 ':
movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 00:46:25 +0000 (01:46 +0100)]
Merge commit '
cf589faa5b7aed3bb38e08dcd00bd951e69686d1 '
* commit '
cf589faa5b7aed3bb38e08dcd00bd951e69686d1 ':
movenc: Add a flag for using default-base-is-moof in tfhd atoms
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Oct 2014 00:36:47 +0000 (01:36 +0100)]
doc: Add documentation for the whitelist options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 22:58:52 +0000 (23:58 +0100)]
avcodec/h264_parser: Use av_freep() to avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 22:36:51 +0000 (23:36 +0100)]
avcodec/cngdec: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 22:35:32 +0000 (23:35 +0100)]
avcodec/crystalhd: use av_freep() to avoid stale pointers
this leaves some av_free() where the pointer is overwritten
shortly later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 22:29:33 +0000 (23:29 +0100)]
avcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 22:28:15 +0000 (23:28 +0100)]
avcodec/dvbsubdec: merge declaration and init
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 29 Oct 2014 20:55:23 +0000 (22:55 +0200)]
movenc: Don't write any iso brands in ismv files
We deviate slightly from the iso specs for these files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 30 Oct 2014 07:35:10 +0000 (09:35 +0200)]
movenc: Don't write any tfdt atom for ismv files
The tfdt atom shouldn't be needed in those cases, we already
write tfxd atoms for ismv anyway, which is roughly equivalent.
This avoids having to declare the iso6 brand for ismv files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 29 Oct 2014 20:51:29 +0000 (22:51 +0200)]
movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov
ISO/IEC 14496-12:2012/Cor 1:2013 is explicit about how this should be
handled. All zeros doesn't mean that the full file has got a zero
duration, only that the track samples described within the initial moov
have got zero duration. An all ones duration means an indeterminate
duration.
Keep writing a duration consisting of all ones for the ISM mode -
older windows media player versions won't play a file if this is
zero. (Newer windows media player versions play either version fine.)
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 30 Oct 2014 18:24:49 +0000 (19:24 +0100)]
avcodec/dxtory: use unaligned copy for unaligned addresses
Fixes undefined behavior
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 17:16:25 +0000 (18:16 +0100)]
avcodec/svq1dec: zero terminate embedded message before printing
Fixes out of array access
Fixes: asan_stack-oob_49b1e5_10_009.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 15:53:09 +0000 (16:53 +0100)]
avcodec/cook: check that the subpacket sizes fit in block_align
Fixes out of array read
Fixes: asan_heap-oob_fb5c50_19_018.rmvb
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 11:48:05 +0000 (12:48 +0100)]
avdevice/xcbgrab: Fix offset support
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Thu, 23 Oct 2014 13:17:55 +0000 (15:17 +0200)]
ffprobe.xsd: add packets_and_frames element definition
This allows validation of ffprobe XML output if -show_packets and
-show_frames are both set.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:22:34 +0000 (10:22 +0100)]
Fix compilation of xcbgrab if xcb/shape.h is not available.
Old versions of libxcb do not provide xcb_shape_rectangles().
The issue can be fixed differently but this small change fixes
some fate platforms and a user reported compilation problem.
Reported and tested by trac user kevmitch.
Fixes ticket #4067.
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:05:45 +0000 (10:05 +0100)]
Fix xcbgrab build if shm is not available.
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:03:45 +0000 (10:03 +0100)]
Fix disabling libxcb-shm and libxcb-xfixes.
Michael Niedermayer [Thu, 30 Oct 2014 01:45:55 +0000 (02:45 +0100)]
Merge commit '
600d5ee6b12bad144756b0772319bb04796bc528 '
* commit '
600d5ee6b12bad144756b0772319bb04796bc528 ':
movenc: Signal iso6 in compatible_brands when using tfdt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 01:45:36 +0000 (02:45 +0100)]
Merge commit '
a9911a1b2df37ca808e06dc30627215f4ec9a9e4 '
* commit '
a9911a1b2df37ca808e06dc30627215f4ec9a9e4 ':
doc: Document the omit_tfhd_offset flag to the mp4 muxer
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 01:36:53 +0000 (02:36 +0100)]
Merge commit '
1e0b81abe86dc09dd34d60d57f92de5f12d65818 '
* commit '
1e0b81abe86dc09dd34d60d57f92de5f12d65818 ':
movenc: Use a local variable consistently
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 01:24:49 +0000 (02:24 +0100)]
Merge commit '
b2b79eca6fae2466a53c5daa163a37e2474364fc '
* commit '
b2b79eca6fae2466a53c5daa163a37e2474364fc ':
movenc: Don't check the custom IO flag when using faststart
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 01:15:39 +0000 (02:15 +0100)]
Merge commit '
573b1de2d7f1db71030f91ecdded7d0bc071f6b6 '
* commit '
573b1de2d7f1db71030f91ecdded7d0bc071f6b6 ':
movenc: Don't use track_id to decide which track is the first in a moof
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Oct 2014 00:19:17 +0000 (01:19 +0100)]
avcodec/g2meet: check tile dimensions to avoid integer overflow
Fixes out of array access
Fixes: asan_heap-oob_12a55d3_30_029.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 29 Oct 2014 23:27:04 +0000 (00:27 +0100)]
lavc/utils: Make pix_fmt desc pointer const.
Fixes an "initialization discards qualifiers from pointer target type" warning.
Carl Eugen Hoyos [Wed, 29 Oct 2014 23:26:27 +0000 (00:26 +0100)]
Autodetect libxcb.
Thomas Mundt [Wed, 29 Oct 2014 20:26:25 +0000 (20:26 +0000)]
mxfenc: fix indentation after last commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>