OSDN Git Service
Michael Niedermayer [Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)]
Merge commit '
d48430c367947a64647c6959cf472f2c01778b17'
* commit '
d48430c367947a64647c6959cf472f2c01778b17':
build: Let the SVQ3 decoder depend on the H.264 decoder
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 20:58:46 +0000 (21:58 +0100)]
Merge commit '
84bf8817206126dab3c9abf6055b593389bcb241'
* commit '
84bf8817206126dab3c9abf6055b593389bcb241':
configure: Split x86 SIMD architecture extensions into separate list
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 6 Mar 2014 18:07:53 +0000 (19:07 +0100)]
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 6 Mar 2014 18:03:07 +0000 (19:03 +0100)]
Fix spelling error 'Inconsistant -> Inconsistent'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 6 Mar 2014 17:58:04 +0000 (18:58 +0100)]
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 5 Mar 2014 22:44:36 +0000 (19:44 -0300)]
x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()
Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 6 Mar 2014 12:04:03 +0000 (13:04 +0100)]
build: Let the SVQ3 decoder depend on the H.264 decoder
The SVQ3 decoder reuses large parts of the H.264 decoder so it
makes no sense to enable the former but not the latter.
Also drop unnecessary h263.o object from SVQ3 decoder object list.
sfan5 [Thu, 6 Mar 2014 15:00:30 +0000 (16:00 +0100)]
libx265: Use ctx->vui. instead of ctx-> for some options A recent change in libx265 moved some options such as sar_width into a 'vui' struct.
Signed-off-by: sfan5 <sfan5@live.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 15:58:24 +0000 (16:58 +0100)]
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 6 Mar 2014 04:39:25 +0000 (01:39 -0300)]
lavd/Makefile: Add fbdev_common.h to SKIPHEADERS
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 13:59:58 +0000 (14:59 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 13:09:48 +0000 (14:09 +0100)]
Merge commit '
3bfdee00cd92ff07c364d4901c4aefda32780756'
* commit '
3bfdee00cd92ff07c364d4901c4aefda32780756':
x86: dcadsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/dcadsp_init.c
See:
206167a295a5c28cec3c38f7308835b0b7e0618f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 2 Nov 2013 16:21:53 +0000 (17:21 +0100)]
configure: Split x86 SIMD architecture extensions into separate list
This avoids checking inline/external assembly dependencies for x86
extensions that do not play a role in inline/external assembly.
Michael Niedermayer [Thu, 6 Mar 2014 12:09:06 +0000 (13:09 +0100)]
Merge commit '
e1f2987b10112489f6da5501d4c8735a798c9e3f'
* commit '
e1f2987b10112489f6da5501d4c8735a798c9e3f':
FATE: add tests for the shuffleplanes filter
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 11:51:10 +0000 (12:51 +0100)]
Merge commit '
599b81ca9a8e04a27ddad94af462171d16063167'
* commit '
599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 11:38:05 +0000 (12:38 +0100)]
Merge commit '
bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
* commit '
bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
lavfi: use the correct filter context for logging an error.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 6 Mar 2014 07:32:50 +0000 (08:32 +0100)]
vf_shuffleplanes: fix the type of the mapping indices
They are TYPE_INT AVOptions, so they must be ints
Lukasz Marek [Sun, 2 Mar 2014 16:47:19 +0000 (17:47 +0100)]
Revert "lavu/buffer: add release function"
This reverts commit
3144440004941aa22ffea9933f5e5dfe826df654.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Mar 2014 01:04:15 +0000 (02:04 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/avdevice: always free detected devices on error
lavf/http: return error from seek on invalid whence
lavf/http: return error on seeking to negative postion
lavf/avio: fix ffurl_alloc error checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 4 Mar 2014 01:57:27 +0000 (02:57 +0100)]
lavd/avdevice: always free detected devices on error
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Thu, 27 Feb 2014 23:36:07 +0000 (00:36 +0100)]
lavf/http: return error from seek on invalid whence
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Thu, 27 Feb 2014 23:36:06 +0000 (00:36 +0100)]
lavf/http: return error on seeking to negative postion
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Fri, 28 Feb 2014 00:12:07 +0000 (01:12 +0100)]
lavf/avio: fix ffurl_alloc error checks
ffurl_alloc doc says it returns >= 0 in case of success.
avio treats non-zero as errors.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Diego Biurrun [Tue, 4 Mar 2014 18:40:21 +0000 (19:40 +0100)]
x86: dcadsp: Fix linking with yasm and optimizations disabled
Some optimized functions reference optimized symbols, so the functions
must be explicitly disabled when those symbols are unavailable.
wm4 [Sun, 2 Mar 2014 19:26:19 +0000 (20:26 +0100)]
http: handle ICY in presence of chunked transfer encoding
Some http servers send an ICY stream in combination with chunked
transfer encoding. This case was handled incorrectly by the ICY code:
instead of handling chunked encoding before anything ICY related, both
were mixed.
Fix this by separating the ICY code from normal http reading. Move the
normal http reading to a new function http_read_stream(), while
http_read() handles ICY on top of http_read_stream().
The server identified itself as: cloudflare-nginx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Myznikov [Wed, 5 Mar 2014 16:21:07 +0000 (18:21 +0200)]
Fix pthread-related compile errors in iec61883.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Mar 2014 21:02:09 +0000 (22:02 +0100)]
doc/APIchanges: fill in missing version for "2013-11-14 -
31c09b7 /
728c465 - lavc 55.26.0 - vdpau.h"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 24 Feb 2014 10:32:16 +0000 (11:32 +0100)]
FATE: add tests for the shuffleplanes filter
Anton Khirnov [Sun, 23 Feb 2014 14:38:13 +0000 (15:38 +0100)]
lavfi: add shuffleplanes filter
Anton Khirnov [Sun, 23 Feb 2014 14:40:06 +0000 (15:40 +0100)]
lavfi: use the correct filter context for logging an error.
Michael Niedermayer [Wed, 5 Mar 2014 20:34:08 +0000 (21:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Mar 2014 20:26:11 +0000 (21:26 +0100)]
Merge commit '
3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
* commit '
3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
x86: cabac: Use correct #includes to make header compile standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Mar 2014 16:07:28 +0000 (17:07 +0100)]
avformat/oggparsevorbis: dont use invalid granules
Fixes Ticket3437
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jason Hsu [Tue, 4 Mar 2014 07:11:57 +0000 (15:11 +0800)]
doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm
Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>
Bug-Id: 646
CC: libav-stable@libav.org
Michael Niedermayer [Wed, 5 Mar 2014 13:17:55 +0000 (14:17 +0100)]
avcodec/ra144enc: avoid calling emms when the SSE2 version is used
emms is a rather slow operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 5 Mar 2014 12:00:23 +0000 (13:00 +0100)]
ra144enc: fix use of scalarprod_int16
c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function
but did not complement it with a call to emms, which is done here before
computations involving floats are performed.
Fixes ticket #3429, which affected MMX/MMXExt machines.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Mar 2014 12:51:09 +0000 (13:51 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Mar 2014 12:44:42 +0000 (13:44 +0100)]
Merge commit '
5ddc9f5052316608799b932c604f9e7561f8ce24'
* commit '
5ddc9f5052316608799b932c604f9e7561f8ce24':
configure: enable PIC on s390(x)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 4 Mar 2014 18:26:28 +0000 (19:26 +0100)]
x86: cabac: Use correct #includes to make header compile standalone
Michael Niedermayer [Wed, 5 Mar 2014 10:48:39 +0000 (11:48 +0100)]
Merge commit '
eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
* commit '
eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
av_vdpau_get_profile: mask out H.264 intra profile flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 5 Mar 2014 09:41:33 +0000 (10:41 +0100)]
avfilter: Add missing emms_c when needed
Arch specific calls should have an emms_c following to keep the cpu
state consistent.
Reported-By: wm4
CC: libav-stable@libav.org
Reinhard Tartler [Sun, 2 Mar 2014 07:11:05 +0000 (02:11 -0500)]
configure: enable PIC on s390(x)
The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.
CC: libav-stable@libav.org
Marton Balint [Sun, 2 Mar 2014 17:34:48 +0000 (18:34 +0100)]
mpegts: use goto out instead of break on truncated or invalid pmt tables
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 1 Mar 2014 18:26:51 +0000 (15:26 -0300)]
x86/synth_filter: add synth_filter_fma3
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Tue, 4 Mar 2014 13:43:59 +0000 (15:43 +0200)]
Add "prefer_tcp" flag to "rtsp_flags"
If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Tue, 4 Mar 2014 19:13:09 +0000 (19:13 +0000)]
av_vdpau_get_profile: mask out H.264 intra profile flag
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
James Almer [Tue, 4 Mar 2014 08:47:38 +0000 (05:47 -0300)]
x86/synth_filter: add missing HAVE_YASM guard
Should fix compilation failures with --disable-yasm on some compilers
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 21:17:51 +0000 (22:17 +0100)]
Merge commit '
3407172b36a93cec410c6a287dbeec0f41257512'
* commit '
3407172b36a93cec410c6a287dbeec0f41257512':
avienc: K&R formatting cosmetics
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 21:01:24 +0000 (22:01 +0100)]
Merge commit '
4c41a7a1798dd6c60e40f79be12faa98a9347151'
* commit '
4c41a7a1798dd6c60e40f79be12faa98a9347151':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 20:55:16 +0000 (21:55 +0100)]
Merge commit '
a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
* commit '
a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
doc: fix a couple of typos in frame.h
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Keiji Costantini [Fri, 28 Feb 2014 18:58:20 +0000 (19:58 +0100)]
avienc: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Vittorio Giovara [Tue, 4 Mar 2014 17:27:09 +0000 (18:27 +0100)]
vf_frei0r: fix missing end of line character
Error introduced in
61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
Vittorio Giovara [Tue, 4 Mar 2014 14:16:51 +0000 (15:16 +0100)]
doc: fix a couple of typos in frame.h
olugbone [Mon, 3 Mar 2014 19:32:41 +0000 (19:32 +0000)]
avformat/mpegtsenc: fix HEVC MPEG TS stream type
Allowing HEVC video using TS stream type 0x24
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 13:12:26 +0000 (14:12 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
put_bits: Remove unused includes
Conflicts:
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 12:37:58 +0000 (13:37 +0100)]
Merge commit '
5397386effba2e53e4ff82852a86f6be4d59e9c1'
* commit '
5397386effba2e53e4ff82852a86f6be4d59e9c1':
mathops: move macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 12:26:48 +0000 (13:26 +0100)]
Merge commit '
61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
* commit '
61b323ce7c7cdc101eadfd7de2203922b8a39e8d':
vf_frei0r: refactor library loading from env variable
Conflicts:
configure
libavfilter/vf_frei0r.c
Not merged, we use av_strtok() which leads to simpler code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 11:50:45 +0000 (12:50 +0100)]
Merge commit '
4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
* commit '
4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 11:41:31 +0000 (12:41 +0100)]
Merge commit '
8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
* commit '
8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 26 Feb 2014 01:26:29 +0000 (02:26 +0100)]
put_bits: Remove unused includes
This requires adding includes to other files that relied on these being
included implicitly.
Vittorio Giovara [Sat, 1 Mar 2014 12:01:43 +0000 (13:01 +0100)]
mathops: move macro to the only place it is used
This helps in disentangling lavf and lavc too.
Vittorio Giovara [Thu, 27 Feb 2014 11:29:37 +0000 (12:29 +0100)]
vf_frei0r: refactor library loading from env variable
strtok_r is not needed any more, so remove it from configure.
Vittorio Giovara [Thu, 27 Feb 2014 11:06:15 +0000 (12:06 +0100)]
vf_frei0r: prevent a segfault when filter parameters are not set
Vittorio Giovara [Thu, 27 Feb 2014 12:41:57 +0000 (13:41 +0100)]
vf_frei0r: adjust error messages
Michael Niedermayer [Tue, 4 Mar 2014 02:41:45 +0000 (03:41 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/avdevice: add device iterators
lavd: add categories to device implementations
lavu/log: add device categories
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Mar 2014 01:47:12 +0000 (02:47 +0100)]
avcodec/h263dec: Workaround H263 end padding bug
Fixes: H263PaddingBugFixVID_6647.MOV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 22 Feb 2014 22:32:55 +0000 (23:32 +0100)]
lavd/avdevice: add device iterators
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 22 Feb 2014 22:32:51 +0000 (23:32 +0100)]
lavd: add categories to device implementations
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sat, 22 Feb 2014 22:32:45 +0000 (23:32 +0100)]
lavu/log: add device categories
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
wm4 [Sun, 2 Mar 2014 21:36:42 +0000 (22:36 +0100)]
avformat/microdvd: export the declared frame rate
MicroDVD files are normally frame-based (i.e. there are no absolute
timestamps), but can have an optional frame rate header. If this
header is missing, the timestamps depend on the frame rate of the
video they were created for.
The demuxer will use a fallback frame rate if it's missing from the
header. Currently, applications using libavformat can't know whether
the time base is based on the fallback value, or if a frame rate
header was present.
This commit introduces a subfps AVOption for MicroDVD, and the
demuxer sets it if and only if a frame rate header was present.
Signed-off-by: Clément Bœsch <u@pkh.me>
wm4 [Sun, 2 Mar 2014 21:36:41 +0000 (22:36 +0100)]
avformat/microdvd: skip BOM properly
The BOM is already skipped in the probe function, but not the header
read function. This could cause the header to be misparsed, such as
not interpreting the FPS line.
Michael Niedermayer [Mon, 3 Mar 2014 19:45:41 +0000 (20:45 +0100)]
ffmpeg: dont try to run the subtitle encoder on non subtitle streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Mar 2014 16:04:57 +0000 (17:04 +0100)]
avformat/httpauth: add comment about "" and algorithm
Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Willy Aubry [Wed, 5 Feb 2014 13:59:00 +0000 (14:59 +0100)]
avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard
When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented.
It is now incremented by one for every media URI removed from the playlist file as the standard states.
Signed-off-by: Willy Aubry <waubry@viotech.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jan Ekström [Sat, 15 Feb 2014 06:58:14 +0000 (01:58 -0500)]
libutvideoenc: 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>
This applies commit
5de64bb3 (the source of the above commit message)
to libutvideoenc as well.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Mar 2014 00:55:18 +0000 (01:55 +0100)]
avformat/utils: detect MPEG streams with faulty DTS and discard affected DTS
Fixes issue2.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 20:44:44 +0000 (21:44 +0100)]
Merge commit '
5c9c305d14730faf2af206e5d519df4948de0ed2'
* commit '
5c9c305d14730faf2af206e5d519df4948de0ed2':
ass: K&R formatting cosmetics
Conflicts:
libavformat/assdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 20:17:48 +0000 (21:17 +0100)]
avcodec/hevcpred_template: also initialize top[-1] for constrained intra prediction
Fixes out of array read
Fixes:
387713a12dc5cfa27fcb4178084ce1ea-asan_stack-oob_131176a_1182_cov_3861068719_CAINIT_C_SHARP_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 14:18:09 +0000 (15:18 +0100)]
avcodec/g2meet: also reset local got_header when reseting the context got_header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 14:16:37 +0000 (15:16 +0100)]
avcodec/g2meet: fix error returns
Fixes out of array accesses
This should not affect any release
Fixes:
8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Patrice Clement [Fri, 28 Feb 2014 17:31:29 +0000 (18:31 +0100)]
ass: K&R formatting cosmetics
Michael Niedermayer [Sun, 2 Mar 2014 11:41:10 +0000 (12:41 +0100)]
Revert "mpegts: do not set pts for missing dts in video streams"
This reverts commit
f65afef1df49f53e14c8d4173ff960fff8d44ecb.
If only pts is coded then dts must be equal pts
See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5
Found-by: Baptiste Coudurier
James Almer [Sun, 2 Mar 2014 02:46:27 +0000 (23:46 -0300)]
x86/synth_filter: Revert the switch to float ops with SSE2
This reverts the changes
64672098361361cd15d37e36f747ab44de5b80ca
and
68c3ed936a76c3ff7738f602fa90237ac7e3ce08 did to the SSE2 version,
which generated a hit of about 5 cycles.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 04:02:15 +0000 (05:02 +0100)]
avformat/oggparsevorbis: check packet size before reading new_len from it
Fixes out of array read
Fixes:
34260c7981118fb38fba61809bf4dd5a-asan_heap-oob_93b923_1508_cov_951051643_DivX640x480_oggvorbis.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 03:15:40 +0000 (04:15 +0100)]
avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()
Fixes out of array read
Fixes:
0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Mar 2014 00:14:59 +0000 (01:14 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ituh263: reject b-frame with pp_time = 0
See:
bb01be80462adcf4900c925e25bc644e512a4b7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 1 Mar 2014 18:26:50 +0000 (15:26 -0300)]
x86/synth_filter: add synth_filter_avx
Sandy Bridge Win64:
180 cycles on ff_synth_filter_inner_sse2
150 cycles on ff_synth_filter_inner_avx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 23:18:25 +0000 (00:18 +0100)]
avformat/mp3dec: optimize mp3_seek() for dir < 0
this minimizes the amount of protocol seeks and reading needed in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 22:09:40 +0000 (23:09 +0100)]
avformat/aviobuf: optimize sequential backward seeking
This reduces the number of protocol seeks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 21:55:37 +0000 (22:55 +0100)]
avformat/aviobuf: factorize buffer_size out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Keiji Costantini [Sat, 1 Mar 2014 18:17:04 +0000 (18:17 +0000)]
ituh263: reject b-frame with pp_time = 0
Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.
Sample-Id:
00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Sat, 1 Mar 2014 16:09:12 +0000 (17:09 +0100)]
RELEASE: update for 2.2
Found-by: Timothy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 1 Mar 2014 03:32:07 +0000 (00:32 -0300)]
x86/synth_filter: add synth_filter_sse
Build only on x86_32 targets.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Senthilnathan M [Sat, 1 Mar 2014 07:43:51 +0000 (13:13 +0530)]
HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376.
Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 14:06:32 +0000 (15:06 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qt-faststart: Add a note about the -movflags +faststart feature
Conflicts:
tools/qt-faststart.c
See:
2574d62d0dd34df762aa2d80c7d6381918a80ed1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 13:39:39 +0000 (14:39 +0100)]
Michael Niedermayer [Sat, 1 Mar 2014 13:32:22 +0000 (14:32 +0100)]
Merge commit '
bb95334c34d0d9abccea370ae25c4765d7764ab8'
* commit '
bb95334c34d0d9abccea370ae25c4765d7764ab8':
qt-faststart: Check offset_count before reading from the moov_atom buffer
Conflicts:
tools/qt-faststart.c
See:
0ea4742341726ebe42c301bc0d6426cfa01dd134
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 13:19:04 +0000 (14:19 +0100)]
Merge commit '
63848854256a024a19435e87d6bc76fffa65e81e'
* commit '
63848854256a024a19435e87d6bc76fffa65e81e':
qt-faststart: Check the ftello() return codes
Conflicts:
tools/qt-faststart.c
See:
4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Mar 2014 13:10:49 +0000 (14:10 +0100)]
Merge commit '
03c2a66fcff9707f71ffef7e61ce5e3973220d4b'
* commit '
03c2a66fcff9707f71ffef7e61ce5e3973220d4b':
qt-faststart: Fix the signedness of variables keeping the ftello return values
Conflicts:
tools/qt-faststart.c
See:
1838961357e38402be64c0c82a2f08e4e85a0c01
Merged-by: Michael Niedermayer <michaelni@gmx.at>