Michael Niedermayer
3ce8581413
Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'
...
* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
mxf: Set audio packets pts
Conflicts:
libavformat/mxfdec.c
See: 83cab07a4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2265212396
Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
...
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
mxf: Introduce ff_mxf_get_samples_per_frame
Conflicts:
libavformat/mxf.c
libavformat/mxf.h
See: 906a263813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1618f162a9
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>
11 years ago
Michael Niedermayer
85d2b0987b
Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'
...
* commit '84bf8817206126dab3c9abf6055b593389bcb241':
configure: Split x86 SIMD architecture extensions into separate list
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andreas Cadhalpun
9898bd9a82
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>
11 years ago
Andreas Cadhalpun
eeb3baf7f7
Fix spelling error 'Inconsistant -> Inconsistent'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andreas Cadhalpun
64b6164b72
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>
11 years ago
Matthieu Bouron
5b930092c3
mxf: Set audio packets pts
...
Extrapolate audio timestamps based on the number of samples demuxed.
Deal with some MXF nastiness involving fractional number of
samples per EditUnit when seeking (the specs handwave this away).
Further fixes from Tomas Härdin.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Matthieu Bouron
e118bb1a33
mxf: Introduce ff_mxf_get_samples_per_frame
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
James Almer
9e0e1f9067
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>
11 years ago
Diego Biurrun
d48430c367
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.
11 years ago
sfan5
69ead9af75
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>
11 years ago
Michael Niedermayer
ffe7e7c195
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
99b4da73c8
lavd/Makefile: Add fbdev_common.h to SKIPHEADERS
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d168729004
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2d99de66b7
Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
...
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
x86: dcadsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/dcadsp_init.c
See: 206167a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
84bf881720
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.
11 years ago
Michael Niedermayer
7011aab501
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>
11 years ago
Michael Niedermayer
2fb0027c26
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>
11 years ago
Michael Niedermayer
b76059058a
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
...
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
lavfi: use the correct filter context for logging an error.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
713d3f98c8
vf_shuffleplanes: fix the type of the mapping indices
...
They are TYPE_INT AVOptions, so they must be ints
11 years ago
Lukasz Marek
bba7b6fc41
Revert "lavu/buffer: add release function"
...
This reverts commit 3144440004
.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c832bf0c38
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>
11 years ago
Lukasz Marek
2475fdbd04
lavd/avdevice: always free detected devices on error
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Lukasz Marek
1aa262f460
lavf/http: return error from seek on invalid whence
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Lukasz Marek
4ba6a534dc
lavf/http: return error on seeking to negative postion
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Lukasz Marek
f495fbe76a
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>
11 years ago
Diego Biurrun
3bfdee00cd
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.
11 years ago
wm4
636273d3d4
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>
11 years ago
Andrey Myznikov
9deecdf85f
Fix pthread-related compile errors in iec61883.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
91550f46cd
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>
11 years ago
Anton Khirnov
e1f2987b10
FATE: add tests for the shuffleplanes filter
11 years ago
Anton Khirnov
599b81ca9a
lavfi: add shuffleplanes filter
11 years ago
Anton Khirnov
bba2a7cc5f
lavfi: use the correct filter context for logging an error.
11 years ago
Michael Niedermayer
a74bab7079
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
146b476ba0
Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
...
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
x86: cabac: Use correct #includes to make header compile standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
12b97dd375
avformat/oggparsevorbis: dont use invalid granules
...
Fixes Ticket3437
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Jason Hsu
8fb4dba89d
doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Janne Grunau
cbddee1cca
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
11 years ago
Michael Niedermayer
100e8f8b67
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>
11 years ago
Christophe Gisquet
93c4cd618c
ra144enc: fix use of scalarprod_int16
...
c3390fd56c
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>
11 years ago
Michael Niedermayer
e3c93f1f84
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5abbeefd5e
Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'
...
* commit '5ddc9f5052316608799b932c604f9e7561f8ce24':
configure: enable PIC on s390(x)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
3741aa37c2
x86: cabac: Use correct #includes to make header compile standalone
11 years ago
Michael Niedermayer
a44a27b5c8
Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
...
* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
av_vdpau_get_profile: mask out H.264 intra profile flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
e995cf1bcc
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
11 years ago
Reinhard Tartler
5ddc9f5052
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
11 years ago
Marton Balint
d08bb065f2
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>
11 years ago
James Almer
7fd64e3e36
x86/synth_filter: add synth_filter_fma3
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andrey Utkin
bc764d786f
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>
11 years ago