]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 4 Feb 2014 15:01:02 +0000 (16:01 +0100)]
ffserver: use avformat_alloc_context()
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Feb 2014 14:37:05 +0000 (15:37 +0100)]
Merge commit '
33c859c142ef3f49b7a6227014ad92a680cf4d74 '
* commit '
33c859c142ef3f49b7a6227014ad92a680cf4d74 ':
lavf: ignore attachment streams for interleaving purposes
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Feb 2014 14:17:19 +0000 (15:17 +0100)]
Merge commit '
7b03b65bf0d02519c86750d2da33f413e11cf0c6 '
* commit '
7b03b65bf0d02519c86750d2da33f413e11cf0c6 ':
lavf: do basic sanity checking on muxed packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Feb 2014 14:08:29 +0000 (15:08 +0100)]
Merge commit '
5de64bb34d68d6c224dca90003172d7a27958825 '
* commit '
5de64bb34d68d6c224dca90003172d7a27958825 ':
utvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Feb 2014 13:54:14 +0000 (14:54 +0100)]
avfilter/dualinput: fix repeatlast to match docs and eof_action=pass
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Feb 2014 13:33:33 +0000 (14:33 +0100)]
Merge commit '
de203abd71baae7f120313259b45cf935c85203e '
* commit '
de203abd71baae7f120313259b45cf935c85203e ':
vf_overlay: add eof_action switch
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 4 Feb 2014 11:23:15 +0000 (03:23 -0800)]
avcodec: Suppress deprecation warnings from avcodec_alloc_frame()
The function is itself obsolete and slated for removal.
Michael Niedermayer [Tue, 4 Feb 2014 12:44:26 +0000 (13:44 +0100)]
Merge commit '
b25e84b7399bd91605596b67d761d3464dbe8a6e '
* commit '
b25e84b7399bd91605596b67d761d3464dbe8a6e ':
hevc: check that the VCL NAL types are the same for all slice segments of a frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 13 Dec 2013 13:30:22 +0000 (14:30 +0100)]
jvdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset data partitioning at the beginning of each decode call
Prevents using GetBitContexts with data from previous calls.
Fixes access to freed memory.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Mon, 20 Jan 2014 12:12:54 +0000 (13:12 +0100)]
vp8: use a fixed-size edge emu buffer
The reason is the same as for
e588615d938f8581f0d6f3771662d08cadfc00de
Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>
Anton Khirnov [Mon, 20 Jan 2014 12:59:06 +0000 (13:59 +0100)]
lavf: ignore attachment streams for interleaving purposes
Those streams should never get any packets by definition.
Anton Khirnov [Mon, 20 Jan 2014 13:10:01 +0000 (14:10 +0100)]
lavf: do basic sanity checking on muxed packets
Reject packets for non-existing or attachment streams.
Jan Ekström [Sun, 2 Feb 2014 13:04:58 +0000 (15:04 +0200)]
utvideoenc: Add support for the new BT.709 FourCCs for YCbCr
With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Keith Lawson [Mon, 3 Feb 2014 00:39:18 +0000 (19:39 -0500)]
vf_overlay: add eof_action switch
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 2 Feb 2014 12:35:48 +0000 (13:35 +0100)]
hevc: check that the VCL NAL types are the same for all slice segments of a frame
Fixes possible invalid memory access for mismatching skipped/non-skipped
slice segments.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Sample-Id:
00001533 -google
Michael Niedermayer [Tue, 4 Feb 2014 01:20:59 +0000 (02:20 +0100)]
avcodec/h264: update current_sps & sps->new only after the whole slice header decoder and init code finished
This avoids them being cleared before the full initialization finished
Fixes out of array read
Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Feb 2014 22:52:38 +0000 (23:52 +0100)]
avcodec/h264: Disallow pps_id changing between slices
Such changes are forbidden in H.264 and lead to race conditions
Fixes out of array read
Fixes: signal_sigsegv_f9796a_1613_cov_3114610371_FM1_BT_B.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Feb 2014 21:15:32 +0000 (22:15 +0100)]
avcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabled
This prevents stale pointers from being left
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Mon, 3 Feb 2014 06:46:11 +0000 (17:46 +1100)]
Fix compilation with msvc/icl due to missing header and define.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Feb 2014 14:33:56 +0000 (15:33 +0100)]
Merge remote-tracking branch 'dilaroga/master'
* dilaroga/master:
vda: fix crash when a frame is dropped.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alex Sukhanov [Mon, 3 Feb 2014 01:16:01 +0000 (17:16 -0800)]
avcodec/aac_adtstoasc_bsf: Fix memory leak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ståle Kristoffersen [Mon, 3 Feb 2014 10:35:19 +0000 (11:35 +0100)]
libavformat/utils.c: Cosmetics: Fix incorrect comma placement
Michael Niedermayer [Mon, 3 Feb 2014 04:04:42 +0000 (05:04 +0100)]
avcodec/aacdec: Fix pulse position checks in decode_pulses()
Fixes out of array read
Fixes: asan_static-oob_1efed25_1887_cov_2013541199_HeyYa_RA10_AAC_192K_30s.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Feb 2014 02:10:46 +0000 (03:10 +0100)]
avcodec/hnm4video: check offset before subtraction in decode_interframe_v4a()
Fixes out of array read
Fixes: signal_sigsegv_1326a09_1752_cov_245452111_GRTH301.HNS
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
addr-see-the-website@aetey.se [Sun, 2 Feb 2014 15:57:36 +0000 (16:57 +0100)]
RoQ encoder: support different integer framerates
Even though the most common framerate for RoQ is 30fps,
the format supports other framerates too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 22:48:37 +0000 (23:48 +0100)]
avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1
This makes the code clearer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Voyager1 [Sun, 2 Feb 2014 14:36:20 +0000 (15:36 +0100)]
avformat/utils: dvd still frames read thru libdvdnav ended up in internal lavf buffer
This is the solution we've been using in XBMC for over 2 years for dvd still frames.
The problem is that the demuxer asks for probing of the codec in the mpeg stream.
This causes lavf to read the whole menu structure into internal buffers.
After which, it won't read from input stream anymore and no events triggers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 2 Feb 2014 13:29:21 +0000 (14:29 +0100)]
lavd/opengl_enc: fix parentheses in if condition
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Sat, 25 Jan 2014 22:19:07 +0000 (23:19 +0100)]
lavfi/ebur128: add true peak metering per frame
Signed-off-by: Jean First <jeanfirst@gmail.com>
Jean First [Sat, 25 Jan 2014 22:19:06 +0000 (23:19 +0100)]
lavfi/ebur128: print peak metering in dBFS
Signed-off-by: Jean First <jeanfirst@gmail.com>
Clément Bœsch [Sat, 25 Jan 2014 22:19:05 +0000 (23:19 +0100)]
lavfi/ebur128: add sample and true peak metering.
Metadata injection and logging. Not yet present visually.
Signed-off-by: Jean First <jeanfirst@gmail.com>
Andrey Utkin [Sat, 1 Feb 2014 13:47:25 +0000 (15:47 +0200)]
lavfi/drawtext: fix reinit command
Problem was that reinit argument wasn't used.
Regression came in at commit
fd6228e65711e63a9e35e9a1087d7ce62040e6e3
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Sun, 2 Feb 2014 14:52:11 +0000 (15:52 +0100)]
lavfi/movie: fix display of pushed frame information
It was broken since
7e350379f87e7f7 .
Also fix warnings:
libavfilter/src_movie.c: In function ‘describe_frame_to_str’:
libavfilter/src_movie.c:392:5: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
libavfilter/src_movie.c:408:9: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
Stefano Sabatini [Sun, 2 Feb 2014 11:58:22 +0000 (12:58 +0100)]
doc/APIchanges: fix weird reindent
Stefano Sabatini [Mon, 27 Jan 2014 18:16:45 +0000 (19:16 +0100)]
lavf: add output_ts_offset option to AVFormatContext
This option can be generally useful to set an output offset, needed when
setting an absolute index in the output.
Stefano Sabatini [Sun, 2 Feb 2014 11:55:40 +0000 (12:55 +0100)]
lavf/avformat.h: fix typos
Stefano Sabatini [Sat, 25 Jan 2014 13:12:15 +0000 (14:12 +0100)]
ffmpeg: tweak debug_ts logging and add more of it
Help with debugging timestamp issues.
Stefano Sabatini [Sun, 2 Feb 2014 11:35:46 +0000 (12:35 +0100)]
examples/avio_reading: remove stray empty line
Stefano Sabatini [Sun, 26 Jan 2014 17:30:06 +0000 (18:30 +0100)]
examples: add avio_reading.c example
Stefano Sabatini [Fri, 24 Jan 2014 16:53:03 +0000 (17:53 +0100)]
lavfi/overlay: add yuv422 format mode
Reynaldo H. Verdejo Pinochet [Fri, 24 Jan 2014 21:40:04 +0000 (18:40 -0300)]
libavformat/mtv: add test for audio magic
MTV files have the string "MP3" as audio magic on their
header. Always.
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Michael Niedermayer [Sun, 2 Feb 2014 04:56:30 +0000 (05:56 +0100)]
fate/xvid: fix idct & bitexact flag
should fix test to match on all platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:40:30 +0000 (05:40 +0100)]
Merge commit '
816e5b997028c8215c804b1e58b2388592ed612b '
* commit '
816e5b997028c8215c804b1e58b2388592ed612b ':
hevc: Reject impossible slice segment
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:32:01 +0000 (05:32 +0100)]
Merge commit '
09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e '
* commit '
09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e ':
hevc: Consider first quantization group any reference to 0, 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:23:59 +0000 (05:23 +0100)]
Merge commit '
c716624853339ea4b1086a3957b334829370204c '
* commit '
c716624853339ea4b1086a3957b334829370204c ':
mxf: Read field dominance flag
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 04:05:11 +0000 (05:05 +0100)]
Merge commit '
7d56f2fffc14ad02001ee0689bee76a759da9ede '
* commit '
7d56f2fffc14ad02001ee0689bee76a759da9ede ':
mxf: Handle negative edit_rate
Conflicts:
libavformat/mxfdec.c
See:
83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 01:42:09 +0000 (02:42 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/opengl_enc: remove inlines
lavd/opengl_enc: fix window caption
lavd/opengl_enc: simplify opengl_load_procedures usage
lavd/opengl_enc: factorize deinit_context function
lavd/opengl_enc: factorize create/release window functions
lavd/opengl_enc: rename GL_RED_COMPONENT define
lavd/opengl_enc: create format description table
lavd/opengl_enc_shaders: make shaders code static and const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Feb 2014 01:33:16 +0000 (02:33 +0100)]
avcodec/hevc: propagate error code from hls_coding_quadtree()
Fixes use of uninitialized memory
Fixes out of array read
Fixes: asan_static-oob_123cee5_2630_cov_1869071233_PICSIZE_A_Bossen_1.bin
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 2 Feb 2014 01:26:02 +0000 (02:26 +0100)]
lavd/opengl_enc: remove inlines
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sun, 2 Feb 2014 00:21:53 +0000 (01:21 +0100)]
lavd/opengl_enc: fix window caption
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 16:14:40 +0000 (17:14 +0100)]
lavd/opengl_enc: simplify opengl_load_procedures usage
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 16:13:15 +0000 (17:13 +0100)]
lavd/opengl_enc: factorize deinit_context function
This commit also fixes opengl deinitialization.
Program and shaders where not deleted.
Could impact MacOS implementation based on SDL window.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 13:39:37 +0000 (14:39 +0100)]
lavd/opengl_enc: factorize create/release window functions
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 1 Feb 2014 13:29:13 +0000 (14:29 +0100)]
lavd/opengl_enc: rename GL_RED_COMPONENT define
Rename GL_RED_COMPONENT into FF_GL_RED_COMPONENT
to explicity mark it is internal define, not OpenGL API.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sun, 2 Feb 2014 00:47:36 +0000 (01:47 +0100)]
avcodec/tiff: reset geotag_count in free_geotags()
Fixes null pointer dereference
Fixes: signal_sigsegv_19d922e_3688_cov_1577641655_aletrek_tiff.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 1 Feb 2014 13:15:25 +0000 (14:15 +0100)]
lavd/opengl_enc: create format description table
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Thu, 30 Jan 2014 15:34:08 +0000 (16:34 +0100)]
lavd/opengl_enc_shaders: make shaders code static and const
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sat, 1 Feb 2014 23:11:16 +0000 (00:11 +0100)]
avdevice/v4l2: only use average frame rate if set
It might be unset on some platforms with some drivers and some input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 23:10:43 +0000 (00:10 +0100)]
avdevice/v4l2: only use frame period from v4l2 if valid
There is evidence that some drivers do not set a valid value
See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718805
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
addr-see-the-website@aetey.se [Fri, 31 Jan 2014 19:06:15 +0000 (20:06 +0100)]
RoQ-encoder: introducing Quake 3 compatibility option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
addr-see-the-website@aetey.se [Wed, 29 Jan 2014 13:33:45 +0000 (14:33 +0100)]
RoQ decoder: Remove misleading diagnostics.
It is not necessarily an error when a chunk does not cover a whole block.
Messages did not reflect the actual situation either.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 18:04:37 +0000 (19:04 +0100)]
avcodec/vc1: reset fcm/field_mode in non advanced header parsing
Fixes NULL pointer dereference
Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 16:07:40 +0000 (17:07 +0100)]
avcodec/vc1: Check bfraction_lut_index
Fixes: out of array read
Fixes: asan_static-oob_1b40507_2849_SA10143.vc1
Fixes: asan_static-oob_1b40a15_2849_cov_1182297305_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_2159513432_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_3230311510_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 16:06:24 +0000 (17:06 +0100)]
avcodec/vc1: factor read_bfraction() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 10:32:07 +0000 (11:32 +0100)]
hevc: Reject impossible slice segment
A dependent slice cannot have address 0.
Prevent an out of array bound load in ff_hevc_cabac_init().
Sample-Id:
00001406 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 11 Jan 2014 03:22:50 +0000 (04:22 +0100)]
hevc: Consider first quantization group any reference to 0, 0
According to my understanding of T-REC-H.265-
2013044 chapter 8.6.1.
Sample-Id:
00001438 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Matthieu Bouron [Sat, 16 Feb 2013 12:52:29 +0000 (13:52 +0100)]
mxf: Read field dominance flag
And export the information in field_order.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Wed, 8 Jan 2014 00:20:00 +0000 (01:20 +0100)]
mxf: Handle negative edit_rate
Default to 1/25.
Michael Niedermayer [Sat, 1 Feb 2014 04:46:24 +0000 (05:46 +0100)]
avcodec/vc1dec: Print warning for frame pictures with direct mode MBs, followed by field pictures
This case is not implemented
No non fuzzed samples are known to use this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Feb 2014 04:34:25 +0000 (05:34 +0100)]
avcodec/vc1dec: field pictures with direct mode MBs, followed by frame pictures are not supported
This case could occur when cuting and concatenating bitstreams
Fixes out of array read
Fixes: asan_heap-oob_1b33fdd_2849_cov_478905890_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 21:50:37 +0000 (22:50 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Auto-detect hevc in mpeg-ts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 19:59:57 +0000 (20:59 +0100)]
avcodec/mjpegdec: use the correct linesize in the flipping code
Fixes out of array access
No releases should be affected
Depends on
7c3700cd1d8683966b21fffbf02e326d0bd14e06 , do not backport without this one
Fixes: asan_heap-oob_14a37fe_9111_cov_1692584941_test4.amv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 18:16:02 +0000 (19:16 +0100)]
avcodec/takdec: always check bits_per_raw_sample
Fixes out of array access
Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ståle Kristoffersen [Fri, 31 Jan 2014 18:05:08 +0000 (19:05 +0100)]
Auto-detect hevc in mpeg-ts.
Fixes decoding of files without PMT/PAT.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:59:14 +0000 (17:59 +0100)]
mxpeg_decode_end: zero bitmask size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:57:17 +0000 (17:57 +0100)]
avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask size
Fixes: heap array overread
Fixes: asan_heap-oob_149b2bc_6577_m1.mxg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:31:21 +0000 (17:31 +0100)]
avformat/flac_picture: clear padding area
aviod use of uninitialized memory
Fixes: asan_heap-oob_1487fa4_4706_cov_364534849_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 16:21:32 +0000 (17:21 +0100)]
avformat/flac_picture: allocate buffer padding for picture
Fixes: heap array overread
Fixes: asan_heap-oob_14876d9_4706_cov_815472558_cover_art.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 14:24:35 +0000 (15:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add xvid test for custom matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 14:16:44 +0000 (15:16 +0100)]
Merge commit '
7716dd9fbbcea2700a100c995df967d5547c2eb9 '
* commit '
7716dd9fbbcea2700a100c995df967d5547c2eb9 ':
xvid: switch to xvid mmx idct as soon as possible
Conflicts:
libavcodec/mpeg4videodec.c
Not merged, as the bug was not merged either
See:
6c9b82b6a0d5cbdf90dcbf9f4e1c77ae82c5698f , and related commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:58:22 +0000 (14:58 +0100)]
Merge commit '
78987a88a88b28d93d03ed6c228bcb33f178444f '
* commit '
78987a88a88b28d93d03ed6c228bcb33f178444f ':
lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:52:57 +0000 (14:52 +0100)]
Merge commit '
5312818524484a995433b986a2a7a6602572d4db '
* commit '
5312818524484a995433b986a2a7a6602572d4db ':
atrac3plus: Make initialization dependant on channel count rather than channel map
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:35:44 +0000 (14:35 +0100)]
Merge commit '
9ee9c679a7d444db223cf932e89cd39351f54f2d '
* commit '
9ee9c679a7d444db223cf932e89cd39351f54f2d ':
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
See:
cd86eb265f36a79d2996f44ba7ec7e7acbc99f81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 13:29:48 +0000 (14:29 +0100)]
Merge commit '
51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2 '
* commit '
51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2 ':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See:
1b3a7e1f42c3d89253e9837ada98e6bfb0cbab2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 29 Jan 2014 17:36:24 +0000 (18:36 +0100)]
fate: add xvid test for custom matrices
Test sample is made from the sample in Bug-Id: videolan/7411
Janne Grunau [Wed, 29 Jan 2014 16:36:40 +0000 (17:36 +0100)]
xvid: switch to xvid mmx idct as soon as possible
The idct implementation cannot be changed after the quantization matrices
are read since it use a different permutaion.
Bug-Id: videolan/7411
Janne Grunau [Wed, 29 Jan 2014 14:12:48 +0000 (15:12 +0100)]
lavf: include 60 fps in guessed standard frame rates
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
Jan Ekström [Thu, 30 Jan 2014 08:37:53 +0000 (08:37 +0000)]
atrac3plus: Make initialization dependant on channel count rather than channel map
Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.
Michael Niedermayer [Fri, 31 Jan 2014 02:27:37 +0000 (03:27 +0100)]
doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 31 Jan 2014 01:56:39 +0000 (02:56 +0100)]
avformat/hdsenc: check mkdir() return code
This also returns failure if the mkdir failure is not due to an already existing
path.
Fixed CID1135749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Jan 2014 19:26:36 +0000 (20:26 +0100)]
ffmpeg: print data size too in statistic
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 30 Jan 2014 23:48:31 +0000 (00:48 +0100)]
doc/APIchanges: apply minor formatting fixes
James Darnley [Thu, 30 Jan 2014 13:58:18 +0000 (14:58 +0100)]
Changelog: add entries relating to metadata_header_padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 30 Jan 2014 19:16:29 +0000 (20:16 +0100)]
ffmpeg: also count data streams bytes
Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 30 Jan 2014 18:01:30 +0000 (19:01 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().
5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm
(i7 920, ssse3)
Michael Niedermayer [Thu, 30 Jan 2014 15:00:47 +0000 (16:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Ronald S. Bultje [Thu, 24 Oct 2013 10:54:32 +0000 (06:54 -0400)]
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Thu, 30 Jan 2014 14:19:51 +0000 (15:19 +0100)]
Merge commit '
a17ab0e46a9fec7c31cc1be363828184c6ecebf7 '
* commit '
a17ab0e46a9fec7c31cc1be363828184c6ecebf7 ':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See:
5e45f03420945dfeaf66729f5d022e5c15ff5723
Merged-by: Michael Niedermayer <michaelni@gmx.at>