generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,373 Commits 24 Branches 241 Tags 173 MiB
1306359ea9
Commit Graph

61373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthieu Bouron
e118bb1a33 mxf: Introduce ff_mxf_get_samples_per_frame 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-06 19:28:20 +01:00
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>
 2014-03-06 18:23:55 +01:00
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.
 2014-03-06 18:23:41 +01:00
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>
 2014-03-06 17:07:46 +01:00
Michael Niedermayer
ffe7e7c195 avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 16:58:24 +01:00
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>
 2014-03-06 15:42:15 +01:00
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>
 2014-03-06 15:18:14 +01:00
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>
 2014-03-06 14:10:27 +01:00
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.
 2014-03-06 13:29:00 +01:00
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>
 2014-03-06 13:09:06 +01:00
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>
 2014-03-06 13:07:20 +01:00
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>
 2014-03-06 12:38:09 +01:00
Anton Khirnov
713d3f98c8 vf_shuffleplanes: fix the type of the mapping indices 
They are TYPE_INT AVOptions, so they must be ints
 2014-03-06 09:24:53 +01:00
Lukasz Marek
bba7b6fc41 Revert "lavu/buffer: add release function" 
This reverts commit 3144440004.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 03:23:40 +01:00
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>
 2014-03-06 02:04:18 +01:00
Lukasz Marek
2475fdbd04 lavd/avdevice: always free detected devices on error 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:34:50 +01:00
Lukasz Marek
1aa262f460 lavf/http: return error from seek on invalid whence 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:32:24 +01:00
Lukasz Marek
4ba6a534dc lavf/http: return error on seeking to negative postion 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:32:20 +01:00
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>
 2014-03-06 00:30:27 +01:00
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.
 2014-03-05 23:16:21 +01:00
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>
 2014-03-05 22:49:36 +01:00
Andrey Myznikov
9deecdf85f Fix pthread-related compile errors in iec61883.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 22:19:33 +01:00
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>
 2014-03-05 22:02:09 +01:00
Anton Khirnov
e1f2987b10 FATE: add tests for the shuffleplanes filter 2014-03-05 21:52:03 +01:00
Anton Khirnov
599b81ca9a lavfi: add shuffleplanes filter 2014-03-05 21:52:02 +01:00
Anton Khirnov
bba2a7cc5f lavfi: use the correct filter context for logging an error. 2014-03-05 21:52:02 +01:00
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>
 2014-03-05 21:35:30 +01:00
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>
 2014-03-05 21:33:44 +01:00
Michael Niedermayer
12b97dd375 avformat/oggparsevorbis: dont use invalid granules 
Fixes Ticket3437

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 17:07:28 +01:00
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>
 2014-03-05 16:10:06 +01:00
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
 2014-03-05 14:30:57 +01:00
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>
 2014-03-05 14:20:03 +01:00
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>
 2014-03-05 13:56:06 +01:00
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>
 2014-03-05 13:51:44 +01:00
Michael Niedermayer
5abbeefd5e Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24' 
* commit '5ddc9f5052316608799b932c604f9e7561f8ce24':
  configure: enable PIC on s390(x)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 13:45:23 +01:00
Diego Biurrun
3741aa37c2 x86: cabac: Use correct #includes to make header compile standalone 2014-03-05 13:32:25 +01:00
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>
 2014-03-05 11:49:27 +01:00
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
 2014-03-05 11:00:05 +01:00
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
 2014-03-04 21:40:36 -05:00
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>
 2014-03-05 02:28:25 +01:00
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>
 2014-03-05 01:58:16 +01:00
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>
 2014-03-04 22:54:13 +01:00
Rémi Denis-Courmont
eeaf4f3b87 av_vdpau_get_profile: mask out H.264 intra profile flag 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-03-04 22:48:55 +01:00
James Almer
206167a295 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>
 2014-03-04 22:47:28 +01:00
Michael Niedermayer
309171bea9 Merge commit '3407172b36a93cec410c6a287dbeec0f41257512' 
* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
	libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-04 22:21:58 +01:00
Michael Niedermayer
adaba6a108 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>
 2014-03-04 22:01:24 +01:00
Michael Niedermayer
4a59994e03 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>
 2014-03-04 21:55:16 +01:00
Keiji Costantini
3407172b36 avienc: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-04 18:53:58 +01:00
Vittorio Giovara
4c41a7a179 vf_frei0r: fix missing end of line character 
Error introduced in 61b323ce7c.
 2014-03-04 18:27:09 +01:00
Vittorio Giovara
a18ef7a76c doc: fix a couple of typos in frame.h 2014-03-04 16:12:11 +01:00