]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 17 Jan 2014 15:45:11 +0000 (16:45 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avisynth: fix setting packet properties
See:
4cb9c2013662b46e8101d6fdf6c69d41668c8b9a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 15:38:10 +0000 (16:38 +0100)]
Merge commit '
104a97beaffa6348e6fd2c2d07d67c1402322bb3 '
* commit '
104a97beaffa6348e6fd2c2d07d67c1402322bb3 ':
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
Conflicts:
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 15:18:27 +0000 (16:18 +0100)]
Merge commit '
5ef11b8dcc054b230deb9b20493255c14a80597d '
* commit '
5ef11b8dcc054b230deb9b20493255c14a80597d ':
yuv4mpeg: set average frame rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 15:11:53 +0000 (16:11 +0100)]
Merge commit '
2ce8bca51f7264b47027f69d50dd8e49aa2fd683 '
* commit '
2ce8bca51f7264b47027f69d50dd8e49aa2fd683 ':
avconv: print a warning when falling back to default 25fps
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 14:31:18 +0000 (15:31 +0100)]
Merge commit '
33018907bd07b34e0e70d5ae12097265eb3734d7 '
* commit '
33018907bd07b34e0e70d5ae12097265eb3734d7 ':
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
Conflicts:
doc/muxers.texi
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 14:23:11 +0000 (15:23 +0100)]
Merge commit '
f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd '
* commit '
f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd ':
mp3enc: add an option for disabling the Xing frame.
Conflicts:
doc/muxers.texi
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 14:05:17 +0000 (15:05 +0100)]
Merge commit '
045654f422e74be8ed09a0819d39051d67633a09 '
* commit '
045654f422e74be8ed09a0819d39051d67633a09 ':
doxy: Document better the available AVFrame flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 13:45:11 +0000 (14:45 +0100)]
Merge commit '
ff23c4e4935e96e62d8ff2212a1955a43add88e1 '
* commit '
ff23c4e4935e96e62d8ff2212a1955a43add88e1 ':
doxy: Add AVFrame to the structured modules
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 13:38:30 +0000 (14:38 +0100)]
Merge commit '
87acd33c092ab9e7d73686627e9105d99c1e4928 '
* commit '
87acd33c092ab9e7d73686627e9105d99c1e4928 ':
aviocat: Add support for specifying the input duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 13:31:13 +0000 (14:31 +0100)]
Merge commit '
03f2de5856ec8571fcf5f4cf6dccc713294af545 '
* commit '
03f2de5856ec8571fcf5f4cf6dccc713294af545 ':
aviocat: Check the argv array length before reading element i+1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 17 Jan 2014 06:55:44 +0000 (03:55 -0300)]
vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2().
Similar gains in performance as the SSSE3 version
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 13 Jan 2014 15:09:26 +0000 (10:09 -0500)]
avisynth: fix setting packet properties
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 16 Jan 2014 10:06:02 +0000 (11:06 +0100)]
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
Anton Khirnov [Wed, 15 Jan 2014 20:14:46 +0000 (21:14 +0100)]
yuv4mpeg: set average frame rate
Anton Khirnov [Wed, 15 Jan 2014 20:32:38 +0000 (21:32 +0100)]
avconv: print a warning when falling back to default 25fps
Anton Khirnov [Tue, 14 Jan 2014 21:06:03 +0000 (22:06 +0100)]
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
Anton Khirnov [Tue, 14 Jan 2014 20:47:45 +0000 (21:47 +0100)]
mp3enc: add an option for disabling the Xing frame.
Luca Barbato [Thu, 16 Jan 2014 00:04:57 +0000 (01:04 +0100)]
doxy: Document better the available AVFrame flags
Luca Barbato [Thu, 16 Jan 2014 00:04:35 +0000 (01:04 +0100)]
doxy: Add AVFrame to the structured modules
Martin Storsjö [Thu, 16 Jan 2014 08:01:03 +0000 (10:01 +0200)]
aviocat: Add support for specifying the input duration
This avoids the caller having to calculate the byte rate if wanting
to push a file in a rate resembling realtime.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 16 Jan 2014 07:58:03 +0000 (09:58 +0200)]
aviocat: Check the argv array length before reading element i+1
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 17 Jan 2014 02:10:42 +0000 (03:10 +0100)]
avcodec: make "bitrate tolerance too small for bitrate" error more verbose
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 01:43:26 +0000 (02:43 +0100)]
avcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call
fixes regression since
80d44190c4d909e9685d04bcde693da3e2441dfd and
1a0370ad94de094a5ac754e790d4ec8d8d0d9ee7
this reverts the buggy changes in these 2 commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Jan 2014 17:33:17 +0000 (18:33 +0100)]
avcodec/huffyuv: fix median prediction for >8bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Jan 2014 16:43:24 +0000 (17:43 +0100)]
avcodec/huffyuv: add YUVA{420,422,444}P{9,10} support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Jan 2014 16:29:58 +0000 (17:29 +0100)]
avcodec/huffyuv: add YUV{420,422,444}P{9,10,12,14} support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 00:14:05 +0000 (01:14 +0100)]
libavcodec/huffyuv: >8 bit support
This adds only yuv420p10, others are trivial to add after this commit
and will be added in a subsequent commit.
Currently the implementation is not optimized, optimizations will be
added later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 00:13:29 +0000 (01:13 +0100)]
avcodec/huffyuvenc: init bps from pixel descriptor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 00:10:21 +0000 (01:10 +0100)]
avcodec/huffyuv: add a field that represents the number of symbols
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 16 Jan 2014 12:30:15 +0000 (07:30 -0500)]
vp9/x86: 16x16 iadst_idct, idct_iadst and iadst_iadst (ssse3+avx).
Sample timings on ped1080p.webm (of the ssse3 functions):
iadst_idct: 4672 -> 1175 cycles
idct_iadst: 4736 -> 1263 cycles
iadst_iadst: 4924 -> 1438 cycles
Total decoding time changed from 6.565s to 6.413s.
Stefano Sabatini [Thu, 16 Jan 2014 11:25:59 +0000 (12:25 +0100)]
lavfi/vidstabtransform: apply various cosmetical nits
Georg Martius [Thu, 9 Jan 2014 21:22:16 +0000 (22:22 +0100)]
configure: add version check for pkg libraries, and use it for vidstab
Also fix trac ticket #3296.
Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Georg Martius [Tue, 8 Oct 2013 21:57:17 +0000 (23:57 +0200)]
lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform
Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Clément Bœsch [Wed, 15 Jan 2014 21:35:43 +0000 (22:35 +0100)]
vp9/x86: simplify a few mc inits.
Carl Eugen Hoyos [Wed, 15 Jan 2014 23:38:27 +0000 (00:38 +0100)]
Warn if s16be is muxed into flv.
Players that conform to the specification can only playback such
files correctly on big-endian hardware.
Carl Eugen Hoyos [Wed, 15 Jan 2014 23:36:27 +0000 (00:36 +0100)]
Never favour an audio stream with 0 channels in av_find_best_stream().
Fixes ticket #3311.
Carl Eugen Hoyos [Wed, 15 Jan 2014 22:37:47 +0000 (23:37 +0100)]
Do not read mkv audio bit_depth if bits_per_coded_sample is already set.
This allows decoding broken mkv files containing G.726 audio.
Carl Eugen Hoyos [Wed, 15 Jan 2014 22:35:22 +0000 (23:35 +0100)]
Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.
The value is wrong and leads to broken files.
Michael Niedermayer [Wed, 15 Jan 2014 22:06:30 +0000 (23:06 +0100)]
avformat/jvdec: clear packet padding after downsize
Fixes: use of uninitialized memeory
Fixes: msan_uninit-mem_7fbf26b5fefe_5981_intro.jv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 22:06:30 +0000 (23:06 +0100)]
avcodec/pgssubdec: Use av_fast_padded_malloc() for rle buffer
Fixes: use of uninitialized memeory
Fixes: msan_uninit-mem_7fa421d0e222_1765_Girl_With_The_Dragon_Tattoo_2_23_56.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 14 Jan 2014 06:11:32 +0000 (03:11 -0300)]
fate: add WebP Exif metadata test
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 19:41:08 +0000 (20:41 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Simplify xvmc deprecation conditional
Conflicts:
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 19:05:18 +0000 (20:05 +0100)]
Merge commit '
dc4d726bab59f349d366916ba01df16289e5c81f '
* commit '
dc4d726bab59f349d366916ba01df16289e5c81f ':
build: Add separate hidden config option for the intrax8 code
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 16:52:19 +0000 (17:52 +0100)]
avformat/mxfdec: fix typo in error check of mxf_edit_unit_absolute_offset()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 14:49:06 +0000 (15:49 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: port neon clobber test from arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 14:36:23 +0000 (15:36 +0100)]
Merge commit '
f896bca03fc63b93851c1c14c9321c20b3cd44a6 '
* commit '
f896bca03fc63b93851c1c14c9321c20b3cd44a6 ':
aarch64: h264 (bi)weight NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 14:27:07 +0000 (15:27 +0100)]
Merge commit '
36e3b1f2fd262028834a9d7b1eb533c1218ee6c2 '
* commit '
36e3b1f2fd262028834a9d7b1eb533c1218ee6c2 ':
aarch64: h264 loop filter NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 14 Jan 2014 17:24:03 +0000 (18:24 +0100)]
x86: dsputil: Simplify xvmc deprecation conditional
Diego Biurrun [Tue, 14 Jan 2014 17:24:02 +0000 (18:24 +0100)]
build: Add separate hidden config option for the intrax8 code
This allows for slightly cleaner dependency specification.
Michael Niedermayer [Wed, 15 Jan 2014 14:20:30 +0000 (15:20 +0100)]
Merge commit '
c65d67ef50241886b9749e88fd333c52090f70c7 '
* commit '
c65d67ef50241886b9749e88fd333c52090f70c7 ':
aarch64: hpeldsp NEON optimizations
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 14:13:12 +0000 (15:13 +0100)]
Merge commit '
d5dd8c7bf0f0d77c581db3236e0d938f06fd5591 '
* commit '
d5dd8c7bf0f0d77c581db3236e0d938f06fd5591 ':
aarch64: h264 qpel NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 14:06:37 +0000 (15:06 +0100)]
Merge commit '
8438b3f09f6b225d0886cc385117c38eb44ca0c1 '
* commit '
8438b3f09f6b225d0886cc385117c38eb44ca0c1 ':
aarch64: h264 idct NEON assembler optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 13:59:44 +0000 (14:59 +0100)]
Merge commit '
71617884a2a673908bd5c0f73d4f91fdca3da82a '
* commit '
71617884a2a673908bd5c0f73d4f91fdca3da82a ':
aarch64: h264 chroma motion compensation NEON optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 13:41:41 +0000 (14:41 +0100)]
Merge commit '
b7b17ed66e199afc7246e642bf3b35c3f8eca217 '
* commit '
b7b17ed66e199afc7246e642bf3b35c3f8eca217 ':
aarch64: add cpuflags support for NEON and VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 13:19:07 +0000 (14:19 +0100)]
Merge commit '
1e9265cd8f0821acbeca1db437be1361a3976b85 '
* commit '
1e9265cd8f0821acbeca1db437be1361a3976b85 ':
dct-test: test ff_simple_idct_neon only on ARM for now
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 13:11:57 +0000 (14:11 +0100)]
Merge commit '
2620df13104ddaa136158eb6bb1195adbf9d7692 '
* commit '
2620df13104ddaa136158eb6bb1195adbf9d7692 ':
mov: Free an earlier allocated array if allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 12:51:58 +0000 (13:51 +0100)]
Merge commit '
d51f09962d5b4bc999fb70c040f330dd1873212e '
* commit '
d51f09962d5b4bc999fb70c040f330dd1873212e ':
mov: Free intermediate arrays in the normal cleanup function
Conflicts:
libavformat/mov.c
See:
a6b3e6d0b49b47c9b874e59b88a8051af338f520
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 14 Jan 2014 07:09:48 +0000 (08:09 +0100)]
vp9/x86: add AVX for itxfm and lpf.
4412 decicycles in ff_vp9_loop_filter_h_16_16_ssse3,
4193462 runs, 842 skips
3600 decicycles in ff_vp9_loop_filter_h_16_16_avx,
4193621 runs, 683 skips
3010 decicycles in ff_vp9_loop_filter_v_16_16_ssse3,
4193528 runs, 776 skips
2678 decicycles in ff_vp9_loop_filter_v_16_16_avx,
4193742 runs, 562 skips
23025 decicycles in ff_vp9_idct_idct_32x32_add_ssse3,
2096871 runs, 281 skips
19943 decicycles in ff_vp9_idct_idct_32x32_add_avx,
2096815 runs, 337 skips
4675 decicycles in ff_vp9_idct_idct_16x16_add_ssse3,
4194018 runs, 286 skips
3980 decicycles in ff_vp9_idct_idct_16x16_add_avx,
4194022 runs, 282 skips
967 decicycles in ff_vp9_idct_idct_8x8_add_ssse3,
16776972 runs, 244 skips
887 decicycles in ff_vp9_idct_idct_8x8_add_avx,
16777002 runs, 214 skips
Janne Grunau [Sat, 11 Jan 2014 16:21:19 +0000 (17:21 +0100)]
aarch64: port neon clobber test from arm
Janne Grunau [Fri, 10 Jan 2014 13:07:24 +0000 (14:07 +0100)]
aarch64: h264 (bi)weight NEON optimizations
Ported from ARMv7 NEON.
Janne Grunau [Fri, 20 Dec 2013 20:02:43 +0000 (21:02 +0100)]
aarch64: h264 loop filter NEON optimizations
Ported from ARMv7 NEON.
Janne Grunau [Fri, 20 Dec 2013 19:03:58 +0000 (20:03 +0100)]
aarch64: hpeldsp NEON optimizations
Ported from ARMv7 NEON.
Janne Grunau [Wed, 18 Dec 2013 14:56:50 +0000 (15:56 +0100)]
aarch64: h264 qpel NEON optimizations
Ported from ARMv7 NEON.
Janne Grunau [Thu, 12 Dec 2013 23:33:48 +0000 (00:33 +0100)]
aarch64: h264 idct NEON assembler optimizations
Ported from ARMv7 NEON.
Janne Grunau [Tue, 10 Dec 2013 19:16:08 +0000 (20:16 +0100)]
aarch64: h264 chroma motion compensation NEON optimizations
Since RV40 and VC-1 use almost the same algorithm so optimizations for
those two decoders are easy to do and included.
Janne Grunau [Tue, 10 Dec 2013 19:13:32 +0000 (20:13 +0100)]
aarch64: add cpuflags support for NEON and VFP
NEON and VFP are currently mandatory for all ARMv8 profiles. Both are
handled as extensions as far as cpuflags are concerned. This is
consistent with handling x86_64 which always has SSE2, but still
handles it as an extension.
Janne Grunau [Mon, 13 Jan 2014 20:32:19 +0000 (21:32 +0100)]
dct-test: test ff_simple_idct_neon only on ARM for now
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Martin Storsjö [Mon, 13 Jan 2014 12:46:07 +0000 (14:46 +0200)]
mov: Free an earlier allocated array if allocating a new one
It could probably also be considered an error if the pointer isn't
null at this point, but then we might risk rejecting some
slightly broken files that we might have handled so far.
Sample-Id:
00000496 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 13 Jan 2014 12:43:23 +0000 (14:43 +0200)]
mov: Free intermediate arrays in the normal cleanup function
These arrays are normally freed at the end of mov_read_trak,
but make sure they're freed in case mov_read_trak returned
early (due to errors) or in case the atoms that allocate arrays
are encountered at some other point than within a trak (which
we don't have checks against).
Sample-Id:
00000496 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 15 Jan 2014 04:22:41 +0000 (05:22 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: bswap inline assembly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 04:16:09 +0000 (05:16 +0100)]
Merge commit '
032d4da8af353e32ab5c86ee3a210f6065921a4a '
* commit '
032d4da8af353e32ab5c86ee3a210f6065921a4a ':
aarch64: configure: set arch dependent features
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 03:59:20 +0000 (04:59 +0100)]
Merge commit '
8b4119187b62d6932e07aded11d33d3b24e1b42f '
* commit '
8b4119187b62d6932e07aded11d33d3b24e1b42f ':
cabac: remove leftovers from the cabac encoder
Not merged, as we have not removed the cabac test which uses these
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 03:30:41 +0000 (04:30 +0100)]
avcodec/hevc_ps: Override max_dec_pic_buffering when its inconsistent with num_reorder_pics
Fixes Ticket3304
Alternatively max_dec_pic_buffering could be removed completely as its not used.
Based on a patch by Jose Santiago <santiago@haivision.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 14 Jan 2014 06:11:31 +0000 (03:11 -0300)]
webp: fix capitalization of the word Exif
Also remove "webp:" from log messages. Using the AVCodecContext is enough.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 00:28:37 +0000 (01:28 +0100)]
avcodec/adpcm: fix sample count for stereo SBPRO3
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b9902ed90_7462_new_alaw.voc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 21:51:59 +0000 (22:51 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxf: Fix potential leak in mxf_read_local_tags()
See:
fbb39f44f1d37451be7d575b5923e6d5851aaecc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 21:43:38 +0000 (22:43 +0100)]
Merge commit '
8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7 '
* commit '
8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7 ':
mxf: Correctly support files from Pinnacle Thunder
See:
a61fada3805122acf8f362d563c9cbae00c2c8cf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 21:29:42 +0000 (22:29 +0100)]
Merge commit '
0d6605c7ef43f97a88950542af09078adef33b6d '
* commit '
0d6605c7ef43f97a88950542af09078adef33b6d ':
mxf: Fix a possible leak of extradata
Conflicts:
libavformat/mxfdec.c
See:
b65570808cb3b518f969f9288fe643bca6361b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 21:16:38 +0000 (22:16 +0100)]
Merge commit '
1a4e4ad0e0c5486dcab05e54b587672a498dd7cf '
* commit '
1a4e4ad0e0c5486dcab05e54b587672a498dd7cf ':
mxf: Use av_malloc_array
Conflicts:
libavformat/mxfdec.c
See:
8ce41721a4a29711211f8dad0c86502caf86f4d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 25 Nov 2013 15:58:54 +0000 (16:58 +0100)]
aarch64: bswap inline assembly
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Thu, 12 Dec 2013 16:45:32 +0000 (17:45 +0100)]
aarch64: configure: set arch dependent features
Stack is always 16 byte aligned and clz, 64bit operations and unaligned
memory access are fast in aarch64 mode on ARMv8.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Janne Grunau [Mon, 13 Jan 2014 20:23:13 +0000 (21:23 +0100)]
cabac: remove leftovers from the cabac encoder
The cabac encoder was only used by the removed cabac test.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Tue, 14 Jan 2014 21:03:32 +0000 (22:03 +0100)]
Merge commit '
f5fbbbc022f723d3ccf99afd5d658a977b51c08a '
* commit '
f5fbbbc022f723d3ccf99afd5d658a977b51c08a ':
mxf: Drop unnecessary checks
Conflicts:
libavformat/mxfdec.c
See:
c5714097eb4c5545f41b5dcb522f7d7470d6f733
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 20:53:12 +0000 (21:53 +0100)]
Merge commit '
aa0cb16c15a5b30f78542f18e3fa65de005cf084 '
* commit '
aa0cb16c15a5b30f78542f18e3fa65de005cf084 ':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See:
3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 20:37:42 +0000 (21:37 +0100)]
Merge commit '
42f9132218ca11a8e9a3c82a175b46bca092113e '
* commit '
42f9132218ca11a8e9a3c82a175b46bca092113e ':
mxf: Do not use int to check the seek position
Conflicts:
libavformat/mxfdec.c
See:
007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 20:21:40 +0000 (21:21 +0100)]
Michael Niedermayer [Tue, 14 Jan 2014 20:00:58 +0000 (21:00 +0100)]
avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 19:53:42 +0000 (20:53 +0100)]
avcodec/mpegaudiodec_template/mp3on4: check that all channels have been decoded before returnig a frame
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f80bf9a259e_5774_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 17:27:50 +0000 (18:27 +0100)]
avcodec/flashsv: check avio_read() return in mov_read_udta_string()
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f3f90a8606a_3018_Sequence_1-Apple_ProRes_422_LT.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Wed, 24 Oct 2012 14:54:25 +0000 (16:54 +0200)]
mxf: Fix potential leak in mxf_read_local_tags()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Tomas Härdin [Wed, 4 Apr 2012 12:24:49 +0000 (14:24 +0200)]
mxf: Correctly support files from Pinnacle Thunder
Such files have IndexTableSegments which when parsed cover EditUnit
ranges like this:
[0,1)
[249,250)
[249,377)
[0,249)
where each interval is
[IndexStartPosition, IndexStartPosition + IndexDuration)
This would be reduced to a sparse index like:
[0,1), [249,250)
instead of the full range:
[0,249), [249,377)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Tue, 11 Dec 2012 13:43:47 +0000 (14:43 +0100)]
mxf: Fix a possible leak of extradata
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Tue, 7 Jan 2014 22:54:09 +0000 (23:54 +0100)]
mxf: Use av_malloc_array
Luca Barbato [Tue, 7 Jan 2014 20:56:33 +0000 (21:56 +0100)]
mxf: Drop unnecessary checks
av_reallocp_array does the check already.
Marton Balint [Wed, 18 Jul 2012 23:23:20 +0000 (01:23 +0200)]
mxf: Fix off by one error in d10 aes3 decoding
Without this fix the last sample was missing from the packet.
Luca Barbato [Tue, 7 Jan 2014 20:26:14 +0000 (21:26 +0100)]
mxf: Do not use int to check the seek position
Overly large files are to be expected.
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
Reimar Döffinger [Thu, 3 Jan 2013 20:42:35 +0000 (21:42 +0100)]
mxf: Set AV_FIELD_PROGRESSIVE
Needed for AVC-intra
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Tue, 14 Jan 2014 15:25:38 +0000 (16:25 +0100)]
avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA
See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Jan 2014 01:28:16 +0000 (02:28 +0100)]
avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again
reenable it for for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Jan 2014 01:27:00 +0000 (02:27 +0100)]
avcodec/simple_idct_template: fix rounding of the special DC case for 10bit
MSE doesnt change for the test as the code only triggers
for very sparse matrixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>