Stefano Sabatini [Sun, 19 Jan 2014 11:19:11 +0000 (12:19 +0100)]
doc/muxers/segment: fix formula for computing the segment_time_delta value
Stefano Sabatini [Thu, 16 Jan 2014 12:08:36 +0000 (13:08 +0100)]
lavfi/vidstabtransform: apply various documentation/option minor fixes
Improve consistency with the rest of the documentation.
Michael Niedermayer [Sun, 19 Jan 2014 05:20:46 +0000 (06:20 +0100)]
avcodec/aacdec: Dont fail if channels arent known yet
Fixes Ticket3312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 03:02:11 +0000 (04:02 +0100)]
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
Fixes Ticket3303
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 03:56:13 +0000 (04:56 +0100)]
avcodec/mjpegdec: only run EOI emulation code when there was a scan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 03:55:01 +0000 (04:55 +0100)]
avcodec/mjpegdec: update cur_scan also for non-LS jpeg
This should make no difference but the variable will be used in a subsequent commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 18 Jan 2014 22:05:31 +0000 (14:05 -0800)]
avcodec/dnxhdenc: return meaningful return codes
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 22:07:36 +0000 (23:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: check that an IDR NAL only contains I slices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 21:58:15 +0000 (22:58 +0100)]
Merge commit '
9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'
* commit '
9ecabd7892ff073ae60ded3fc0a1290f5914ed5c':
h264: reset num_reorder_frames if it is invalid
Note, num_reorder_frames is not used in the failure case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 21:47:49 +0000 (22:47 +0100)]
Merge commit '
0652e024c680420d298cdf3719d0a0c030173fe3'
* commit '
0652e024c680420d298cdf3719d0a0c030173fe3':
h264: reset ref count if decoding the slice header fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 21:07:54 +0000 (22:07 +0100)]
Merge commit '
98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'
* commit '
98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791':
h264: prevent two matching fields from being both a short/long ref combination
See:
92002db3eb437414281ad4fb6e84e34862f7fc92
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 20:45:58 +0000 (21:45 +0100)]
Merge commit '
00dbff4c3e048b4abd01bf805725aabff0fa5ee1'
* commit '
00dbff4c3e048b4abd01bf805725aabff0fa5ee1':
h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 20:37:39 +0000 (21:37 +0100)]
Merge commit '
7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
* commit '
7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Conflicts:
libavcodec/h264.c
See:
d6a33f5d20b6ef2eae2cbb959b001cb125a564b7
See:
2005fddcbb4e18e8f7c34326e40609e4a2d83c31
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 20:21:09 +0000 (21:21 +0100)]
Merge commit '
d1b3fabe6945e511bb20fc9ca52b47eb952526ee'
* commit '
d1b3fabe6945e511bb20fc9ca52b47eb952526ee':
h264: reset first_field if frame_start() fails for missing refs
See:
d7599bd8e240b923486bd130a33d38f66bb14eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Jan 2014 20:13:36 +0000 (21:13 +0100)]
Merge commit '
210881110d3e22cca36edeaca118b5e22c998266'
* commit '
210881110d3e22cca36edeaca118b5e22c998266':
Prepare for 10_alpha2 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: check that an IDR NAL only contains I slices
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset num_reorder_frames if it is invalid
An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset ref count if decoding the slice header fails
Otherwise the ER code might try to use some already freed references.
Fixes possible access to freed memory.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: prevent two matching fields from being both a short/long ref combination
Fixes possible access to freed memory.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: do not call field_end if we do not have a current picture
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset first_field if frame_start() fails for missing refs
In this case we may not have a current frame, while first_field being
set implies we do.
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Martin Storsjö [Sat, 18 Jan 2014 17:17:54 +0000 (18:17 +0100)]
swresample: Add arm&x86 clobber tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 18 Jan 2014 05:29:22 +0000 (02:29 -0300)]
vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
pavgb is an sse integer instruction, so the mmxext flag is enough
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sat, 18 Jan 2014 15:27:27 +0000 (10:27 -0500)]
Prepare for 10_alpha2 Release
Michael Niedermayer [Sat, 18 Jan 2014 04:10:48 +0000 (05:10 +0100)]
avcodec/mpegvideo_enc: fix custom matrixes with jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Loren Merritt [Thu, 16 Jan 2014 21:34:46 +0000 (13:34 -0800)]
x86inc: speed up compilation with yasm
Work around yasm's inefficiency with handling large numbers of variables
in the global scope.
Michael Niedermayer [Fri, 17 Jan 2014 22:52:55 +0000 (23:52 +0100)]
ffmpeg: change ost->finished to an enum
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 16:19:54 +0000 (17:19 +0100)]
ffmpeg: update statistics only when a packet is actually muxed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 15 Jan 2014 16:07:26 +0000 (17:07 +0100)]
ffmpeg/flush_encoders: dont mux packets once ost->finished has been set
Fixes muxing frames after av_interleaved_write_frame() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 03:33:12 +0000 (04:33 +0100)]
ffmpeg: properly close down muxers on av_interleaved_write_frame() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 03:32:05 +0000 (04:32 +0100)]
ffmpeg: check ost->finished in check_output_constraints()
No testcase but it seems logic to stop when finished is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 03:31:29 +0000 (04:31 +0100)]
ffmpeg: check ost->finished in reap_filters()
This avoids finished output streams continuing to receive frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 21:51:07 +0000 (22:51 +0100)]
avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
João Bernardo [Fri, 17 Jan 2014 20:17:43 +0000 (21:17 +0100)]
avfilter/vf_elbg: Fixed seed range of elbg filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 19:58:43 +0000 (20:58 +0100)]
avcodec/dnxhdenc: check that qmax is within the supported range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 19:09:48 +0000 (20:09 +0100)]
dnxhdenc: fix mb_rc size
Fixes out of array access with RC_VARIANCE set to 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 16:58:36 +0000 (17:58 +0100)]
avformat/riff: fix demuxing of h264 INMC
Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Jan 2014 15:57:45 +0000 (16:57 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix libxvid crash on failing initialisation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Carl Eugen Hoyos [Fri, 17 Jan 2014 12:09:57 +0000 (13:09 +0100)]
Fix libxvid crash on failing initialisation.
Fixes ticket #3297.
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.