OSDN Git Service
Michael Niedermayer [Wed, 16 Oct 2013 18:37:09 +0000 (20:37 +0200)]
swscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 14 Oct 2013 01:37:12 +0000 (18:37 -0700)]
doc/filters: reference ffmpeg-utils manual for color and sizes options
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Mon, 14 Oct 2013 01:37:11 +0000 (18:37 -0700)]
doc/utils: reformat doc for color syntax and add list of supported colors
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Wed, 4 Sep 2013 00:19:26 +0000 (17:19 -0700)]
doc/utils: rewrite doc for time duration syntax
Extend description and clarify syntax.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Carl Eugen Hoyos [Wed, 16 Oct 2013 02:12:27 +0000 (04:12 +0200)]
Support HEVC in transport streams.
Ronald S. Bultje [Wed, 16 Oct 2013 15:11:17 +0000 (17:11 +0200)]
avcodec/vp9: fix band_counts array size / padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 27 Feb 2013 19:29:39 +0000 (19:29 +0000)]
avcodec/exr: piz decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 16 Oct 2013 13:08:10 +0000 (15:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Move 8x8 in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 12:51:00 +0000 (14:51 +0200)]
Merge commit '
95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
* commit '
95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 12:02:43 +0000 (14:02 +0200)]
Merge commit '
a90905db2e6ab1840890f3a88bfd3bf008b9d886'
* commit '
a90905db2e6ab1840890f3a88bfd3bf008b9d886':
ffv1: Assume bitdepth 0 means 8bit
Conflicts:
libavcodec/ffv1dec.c
Note, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 11:54:41 +0000 (13:54 +0200)]
Merge commit '
a84616b736fca5ebd6b87489dd41bc06ccdf7860'
* commit '
a84616b736fca5ebd6b87489dd41bc06ccdf7860':
mpegvideo: K&R formatting cosmetics
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 11:08:37 +0000 (13:08 +0200)]
Merge commit '
93f305473f880729d18b5e42067f19d2106cb2e5'
* commit '
93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:51:26 +0000 (12:51 +0200)]
Merge commit '
4baba6c813b7a1f27370e20fb1a87b05fcb39208'
* commit '
4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:38:55 +0000 (12:38 +0200)]
Merge commit '
b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
* commit '
b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:22:40 +0000 (12:22 +0200)]
Merge commit '
6b081eff4dfc3c899960f69f30cb567266b7dca3'
* commit '
6b081eff4dfc3c899960f69f30cb567266b7dca3':
fate: add vorbiscomment cover art test
Conflicts:
tests/fate/cover-art.mak
See:
1ca3902726fb8c1398ab00d146ebe3e2f31b76e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:12:13 +0000 (12:12 +0200)]
Merge commit '
68edd5be0980941924ae633d98589d56a8091bbd'
* commit '
68edd5be0980941924ae633d98589d56a8091bbd':
FATE: use proper comparison mode in the lavr tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 10:02:38 +0000 (12:02 +0200)]
Merge commit '
dd33637c18629c3e554ebb146bbeb45c9745a5cf'
* commit '
dd33637c18629c3e554ebb146bbeb45c9745a5cf':
tiny_psnr: switch f32 handling to floating point
Conflicts:
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 09:30:17 +0000 (11:30 +0200)]
Merge commit '
29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'
* commit '
29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
bitstream: Check the result of av_malloc()
Conflicts:
libavcodec/bitstream.c
See:
aa74810fc6b9afe21c9be3725e3d078d10633670
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 09:05:02 +0000 (11:05 +0200)]
Merge commit '
3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'
* commit '
3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
cavs: more K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Oct 2013 08:55:32 +0000 (10:55 +0200)]
Merge commit '
c0085f94fea89b180e5727b193484a83586d3490'
* commit '
c0085f94fea89b180e5727b193484a83586d3490':
mpegaudio_tablegen: Don't use llrint
cos_tablegen: Don't use lrint
tablegen: Don't use cbrtf in host tools
tableprint: Fix use of a size_t print with MSVC
Conflicts:
libavcodec/cbrt_tablegen.h
libavcodec/mpegaudio_tablegen.h
See:
e51692114354b8e460bf5c9f6def7089a6b969c0
See:
50867209930fd03c05b879bd6223b52c7305c90a
See:
008014b5e72442fe7c8bf4a31e6bb74469b81359
See:
00aa24ffee91d52488765088ea0f60748e2a2083
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Tue, 15 Oct 2013 21:04:25 +0000 (23:04 +0200)]
hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit
19c5d9ed28606e7a166d180fc9f1517cb174146f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 23:26:50 +0000 (01:26 +0200)]
fate: fix DBLK_A_MAIN10_VIXS_2 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 12 Oct 2013 09:55:47 +0000 (11:55 +0200)]
FATE: add HEVC tests
The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 22:26:10 +0000 (00:26 +0200)]
avformat/mov: fix "correctly" typo
Found-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Sat, 12 Oct 2013 09:55:46 +0000 (11:55 +0200)]
lavf/matroskadec: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Sat, 12 Oct 2013 09:55:45 +0000 (11:55 +0200)]
lavf/mov: Support HEVC demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
gcocherel [Tue, 15 Oct 2013 14:47:52 +0000 (16:47 +0200)]
valgrind cleanup(cherry picked from commit
0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 13 Oct 2013 05:55:14 +0000 (07:55 +0200)]
mpegvideo: Move 8x8 in a separate function
Luca Barbato [Sun, 13 Oct 2013 05:27:11 +0000 (07:27 +0200)]
mpegvideo: Move obmc in a separate function
Luca Barbato [Sun, 13 Oct 2013 13:34:47 +0000 (15:34 +0200)]
ffv1: Assume bitdepth 0 means 8bit
CC: libav-stable@libav.org
Reported-by: debian/726189
Luca Barbato [Sun, 13 Oct 2013 05:13:01 +0000 (07:13 +0200)]
mpegvideo: K&R formatting cosmetics
Ronald S. Bultje [Sun, 13 Oct 2013 00:42:42 +0000 (02:42 +0200)]
lavc: Convert some remaining strides to ptrdiff_t
Mickaël Raulet [Fri, 11 Oct 2013 19:43:58 +0000 (21:43 +0200)]
hevc: add ts demux support
cherry picked from commit
925ee44364a7bce58e2ac5bac91077ce0a75d883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Oct 2013 13:09:08 +0000 (15:09 +0200)]
lavc/hevc: mark decoder as experimental
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Oct 2013 13:00:38 +0000 (15:00 +0200)]
lavc/hevc_ps: fix PIX_FMT enums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 12 Oct 2013 09:55:48 +0000 (11:55 +0200)]
lavc: add a HEVC decoder.
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:
Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 19:43:32 +0000 (21:43 +0200)]
avcodec/mpegaudio_tablegen: remove dead branch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 19:18:48 +0000 (21:18 +0200)]
avformat: rename a few more h.265 to HEVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 18:06:44 +0000 (20:06 +0200)]
avcodec: improve precission for cbrtf() emulation
cbrtf() took floats but it represented 1/3 exactly
and even if not more precission should be better in theory
for the table generation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Tue, 24 Sep 2013 09:30:50 +0000 (18:30 +0900)]
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Yusuke Nakamura [Mon, 16 Sep 2013 09:34:27 +0000 (18:34 +0900)]
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
The prev_ values were not set after parsing POC.
Increase length of the buffer decoded to parse enough safely.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Fri, 26 Jul 2013 05:56:19 +0000 (02:56 -0300)]
fate: add vorbiscomment cover art test
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 14 Oct 2013 19:17:26 +0000 (21:17 +0200)]
FATE: use proper comparison mode in the lavr tests
Anton Khirnov [Mon, 14 Oct 2013 19:10:08 +0000 (21:10 +0200)]
tiny_psnr: switch f32 handling to floating point
Also add support for f64.
Diego Biurrun [Tue, 15 Oct 2013 12:34:55 +0000 (14:34 +0200)]
bitstream: Check the result of av_malloc()
Diego Biurrun [Mon, 14 Oct 2013 17:12:52 +0000 (19:12 +0200)]
cavs: more K&R formatting cosmetics
Derek Buitenhuis [Tue, 15 Jan 2013 21:09:01 +0000 (16:09 -0500)]
mpegaudio_tablegen: Don't use llrint
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:09:00 +0000 (16:09 -0500)]
cos_tablegen: Don't use lrint
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:08:59 +0000 (16:08 -0500)]
tablegen: Don't use cbrtf in host tools
You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:08:58 +0000 (16:08 -0500)]
tableprint: Fix use of a size_t print with MSVC
%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:05 +0000 (16:28 -0500)]
mpegaudio_tablegen: Don't use llrint
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:04 +0000 (16:28 -0500)]
cos_tablegen: Don't use lrint
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:03 +0000 (16:28 -0500)]
tablegen: Don't use cbrtf in host tools
You cannot count on them being present on all systems, and you
cannot include libm.h in a host tool, so just hard code baseline
implementations.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 15 Jan 2013 21:28:02 +0000 (16:28 -0500)]
tableprint: Fix use of a size_t print with MSVC
%zu was introduced in C99, so MSVC has its own way to handle it,
namely %Iu.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Tue, 15 Oct 2013 13:52:27 +0000 (15:52 +0200)]
configure: Warn when inline asm is disabled for ICL
See Ticket3048
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 15 Oct 2013 13:17:22 +0000 (15:17 +0200)]
lavf/segment: simplify logic and fix !=0 check on segment_end return value
A successfull return value can be > 0.
Billy Shambrook [Tue, 15 Oct 2013 10:53:40 +0000 (11:53 +0100)]
lavf/segment: log segments as they end to AV_LOG_VERBOSE
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Tue, 15 Oct 2013 12:54:25 +0000 (14:54 +0200)]
lavf/segment: simplify segment_count update
Now segment_count mark the segment_count of the current segment.
Paul B Mahol [Sun, 13 Oct 2013 20:37:07 +0000 (20:37 +0000)]
fate: add pxr24 exr test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 15 Oct 2013 11:15:47 +0000 (13:15 +0200)]
avcodec/jpeg2000dec: fix context consistency with too large lowres
Fixes out of array accesses
Fixes Ticket2898
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 07:34:27 +0000 (09:34 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Check the auth string contents and not only the pointer
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Oct 2013 00:05:11 +0000 (02:05 +0200)]
avcodec/x86/dsputil_init: move ff_idct_xvid_mmxext init
This decreases the diff to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 23:59:36 +0000 (01:59 +0200)]
avcodec/x86/dsputil_init: remove duplicated sse2 idct init
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 23:35:47 +0000 (01:35 +0200)]
avcodec/x86/dsputil_init: fix cpu flag checks
Fixes linking failure with --disable-sse2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Sun, 13 Oct 2013 00:40:22 +0000 (16:40 -0800)]
doc: make x11grab examples consistent with option names
Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Vignesh Venkatasubramanian [Mon, 14 Oct 2013 17:42:08 +0000 (10:42 -0700)]
matroskadec: Demux support for SeekPreRoll and CodecDelay
Adds support for demuxing SeekPreRoll and CodecDelay container
elements.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 22:56:32 +0000 (00:56 +0200)]
http: Check the auth string contents and not only the pointer
This makes sure we don't send the Except: 100-continue header
if no authentication credentials have been provided.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Mon, 14 Oct 2013 18:18:25 +0000 (18:18 +0000)]
avformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vignesh Venkatasubramanian [Mon, 14 Oct 2013 14:41:16 +0000 (07:41 -0700)]
lavc: Adding seek_preroll to AVCodecContext
seek_preroll field is added to the AVCodecContext struct. It indicates
the number of samples to be discarded whenever there is a discontinuity.
The minor version is bumped accordingly.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 14 Oct 2013 14:29:58 +0000 (16:29 +0200)]
Support H.264 fourcc UMSV.
Fixes ticket #3046.
Michael Niedermayer [Mon, 14 Oct 2013 14:13:53 +0000 (16:13 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: more AVX2 framework
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 14:06:17 +0000 (16:06 +0200)]
Merge commit '
c6908d6b4b377a04a5d055ba874bdbcf06c80497'
* commit '
c6908d6b4b377a04a5d055ba874bdbcf06c80497':
x86inc: FMA3/4 Support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 13:53:46 +0000 (15:53 +0200)]
Merge commit '
206895708ea2b464755d340e44501daf9a07c310'
* commit '
206895708ea2b464755d340e44501daf9a07c310':
x86inc: Remove our FMA4 support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 13:48:30 +0000 (15:48 +0200)]
Merge commit '
c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'
* commit '
c108ba0175d4fc3a3253a8b0f782fbfb96ba5098':
x86inc: Use VEX-encoded instructions in AVX functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 13:36:57 +0000 (15:36 +0200)]
Merge commit '
15748773bf33c110e6e2e9526c7ba5478274c74c'
* commit '
15748773bf33c110e6e2e9526c7ba5478274c74c':
avresample/x86: Switch operand order for mulps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 13:31:05 +0000 (15:31 +0200)]
Merge commit '
84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'
* commit '
84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c':
rtmp: Allocate the prev_pkt arrays dynamically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jason Garrett-Glaser [Wed, 27 Feb 2013 00:26:34 +0000 (16:26 -0800)]
x86: more AVX2 framework
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Jason Garrett-Glaser [Mon, 12 Nov 2012 18:28:53 +0000 (10:28 -0800)]
x86inc: FMA3/4 Support
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 9 Oct 2013 12:54:59 +0000 (08:54 -0400)]
x86inc: Remove our FMA4 support
This is so we can sync to x264's version of FMA4 support.
This partialy reverts commit
79687079a97a039c325ab79d7a95920d800b791f.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Henrik Gramner [Tue, 11 Dec 2012 15:05:34 +0000 (16:05 +0100)]
x86inc: Use VEX-encoded instructions in AVX functions
Automatically use VEX-encoding in AVX/AVX2/XOP/FMA3/FMA4
functions for all instructions that exists in a VEX-encoded
version.
This change makes it easier to extend existing code to use AVX2.
Also add support for AVX emulation of a few instructions that
were missing before.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 9 Oct 2013 12:41:36 +0000 (08:41 -0400)]
avresample/x86: Switch operand order for mulps
With the forthcoming VEX instruction emulation, mulps
must have only the third operand point to memory, as
this is what vmulps expects.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Martin Storsjö [Fri, 11 Oct 2013 19:16:04 +0000 (22:16 +0300)]
rtmp: Allocate the prev_pkt arrays dynamically
Normally, all channel ids are between 0 and 10, while they in
uncommon cases can have values up to 64k.
This avoids allocating two arrays for up to 64k entries (at a total
of over 6 MB in size) each when most of them aren't used at all.
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Sun, 13 Oct 2013 23:02:28 +0000 (20:02 -0300)]
movenc: use ff_alloc_extradata()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 14 Oct 2013 08:15:26 +0000 (05:15 -0300)]
oggparsecelt: use ff_alloc_extradata()
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 13 Oct 2013 23:02:26 +0000 (20:02 -0300)]
oggparseopus: use ff_alloc_extradata()
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 08:17:47 +0000 (10:17 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cavs: Check for negative cbp
Conflicts:
libavcodec/cavsdec.c
See:
9f06c1c61e876e930753da200bfe835817e30a53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 00:10:43 +0000 (02:10 +0200)]
Merge commit '
1b20d0f581f01f2df601c9e68d0d321672d97af7'
* commit '
1b20d0f581f01f2df601c9e68d0d321672d97af7':
cavs: Return meaningful error values
Conflicts:
libavcodec/cavsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Oct 2013 00:04:38 +0000 (02:04 +0200)]
Merge commit '
14ddbb477faef359983151b763fd8b20e578651b'
* commit '
14ddbb477faef359983151b763fd8b20e578651b':
cavs: K&R formatting cosmetics
Conflicts:
libavcodec/cavs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 22:56:32 +0000 (00:56 +0200)]
avformat/http: check the auth string contents not the pointer which cannot be NULL
It appears this bug originates from a "work in progress" patch from
ffmpeg-devel that was heavily redesigned by and integrated in libav
And that patch even had a reply and review on the mailing list pointing
out that it had a bug.
This fixes a deadlock with ffserver
See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions.
[FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036
[FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036
[FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036
See:
71549a857b13edf4c4f95037de6ed5bb4c4bd4af
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)]
Merge commit '
71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
* commit '
71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
http: Support auth method detection for POST
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 22:17:49 +0000 (00:17 +0200)]
Merge commit '
eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
* commit '
eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
http: Add an option for forcing basic authentication
Conflicts:
libavformat/http.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 22:04:52 +0000 (00:04 +0200)]
Merge commit '
eb90a2091ffb94d8c29aaa5ff50f4192520254fc'
* commit '
eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
pthread: Fix deadlock during thread initialization
Conflicts:
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 13 Oct 2013 20:21:03 +0000 (20:21 +0000)]
avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 13 Oct 2013 10:30:59 +0000 (10:30 +0000)]
avformat: use ff_alloc_extradata()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 13 Oct 2013 10:19:09 +0000 (10:19 +0000)]
avformat: add ff_alloc_extradata() helper
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 13 Oct 2013 19:18:23 +0000 (21:18 +0200)]
avcodec/jpeg2000dec: prevent out of array accesses in pixel addressing
Fixes Ticket2921
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 18:26:11 +0000 (20:26 +0200)]
avcodec/jpeg2000: zero i/f_data
Fixes uninitialized use of variables
Fixes part of Ticket2921
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 17:37:16 +0000 (19:37 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add support for changing the channel by the C key
ffplay: cycle through the streams of the current program, and not every stream
ffplay: add null packet after attached pics packet
ffplay: factor out putting null packet into the queue
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 19 Aug 2013 01:33:40 +0000 (03:33 +0200)]
avcodec/jpeg2000dec: check transform equality in MCT
Fixes null pointer dereference
Fixes Ticket2843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Oct 2013 16:24:08 +0000 (18:24 +0200)]
avformat/oggparseopus: fix nb_headers
Line comes from
ecab1c77410f023b437c6ed3a3281be8f039e574
and was not merged previously
Thanks-to: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>