1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

64459 Commits

Author SHA1 Message Date
Michael Niedermayer
418e5768c6 swresample/resample_template: move division out of loop for float/double swri_resample_linear()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 04:30:10 +02:00
Michael Niedermayer
86576129bd Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
  configure: enable lto for icl compiler.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 22:26:46 +02:00
Michael Niedermayer
c5a405c4f0 swresample/resample_template: flip order of operations in swri_resample_linear() for 32bit
Fixes integer overflow

Found-by: BBB
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 22:19:57 +02:00
Matthew Oliver
09adb1dd36 configure: enable lto for icl compiler. 2014-06-29 19:24:12 +02:00
Michael Niedermayer
7f5d75f95b cmdutils: ignore sws_flags if swscale is not enabled
This avoids some failures during fate when swscale is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 17:27:23 +02:00
Michael Niedermayer
3f42434600 avcodec/huffyuvencdsp: try to fix misaligned access
Should fix fate on MIPS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 16:26:38 +02:00
Michael Niedermayer
cddbf95c5f doc/examples/resampling_audio: use av_freep() for saftey
also its better in examples to use the safer functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 16:26:38 +02:00
Clément Bœsch
d5f817793e avfilter/overlay: reindent 2014-06-29 13:26:12 +02:00
Clément Bœsch
b18d1b094e avfilter/buffersrc: reindent 2014-06-29 13:26:04 +02:00
Michael Niedermayer
f02a440814 ffmpeg_opt: route -ab to -b:a
Fixes combining -ab with -target pal-dvd
Fixes Ticket3736

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 02:47:49 +02:00
Michael Niedermayer
525a165d99 avfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARM
The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29 00:52:42 +02:00
Michael Niedermayer
4d3072ada3 doc/examples/muxing: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:44:38 +02:00
Michael Niedermayer
01983e50c0 Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'
* commit '7b0c7c9163fe3dd0081696befde28617119d2590':
  arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:31:18 +02:00
Michael Niedermayer
e6aba1be4c avformat/options_table: Fix flush_packet flag flags
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:24:15 +02:00
Michael Niedermayer
c599c211fb avformat/mux: fix flush_packets flag with flushing buffers
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:23:32 +02:00
Martin Storsjö
7b0c7c9163 arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel
When running on a 64 bit kernel, /proc/cpuinfo lists different
optional features than on 32 bit kernels (because some of them
are mandatory in the 64 bit implemenations).

The kernel does list the old features properly if they are queried
via /proc/self/auxv though - however this file is not always readable
(e.g. on most android systems). The getauxval function could also
provide the same info as /proc/self/auxv even if this file isn't
readable, but this function is not always available (and thus would
need to be loaded with dlsym for compatibility with older android
versions).

The android cpufeatures library does this slightly differently,
by assuming that these are available if the "CPU architecture"
line is >= 8, see [1] for details.

It has been suggested to include the old, non-optional features in
/proc/cpuinfo as well, but that suggested patch never was merged.
See [2] for the discussion around this suggestion.

[1] https://android-review.googlesource.com/91380
[2] http://marc.info/?l=linux-arm-kernel&m=139087240101974

Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-28 22:16:59 +03:00
Yao Wang
5464916677 avcodec/cavs: improve conformance with rm52j reference decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 19:53:41 +02:00
Michael Niedermayer
f9f8491ddf avcodec/cavs: make cavs_chroma_qp non static
The table is needed by multiple files

Reverts part of ef07ac1e12

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 19:08:39 +02:00
Ronald S. Bultje
faa1471ffc swr: rewrite resample_common/linear_float_sse/avx in yasm.
Linear interpolation goes from 63 (llvm) or 58 (gcc) to 48 (yasm)
cycles/sample on 64bit, or from 66 (llvm/gcc) to 52 (yasm) cycles/
sample on 32bit. Bon-linear goes from 43 (llvm) or 38 (gcc) to
32 (yasm) cycles/sample on 64bit, or from 46 (llvm) or 44 (gcc) to
38 (yasm) cycles/sample on 32bit (all testing on OSX 10.9.2, llvm
5.1 and gcc 4.8/9).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 17:06:47 +02:00
Michael Niedermayer
a348f4befe avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" with nasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 16:06:00 +02:00
Ronald S. Bultje
ddb7b4435a swr: move dst_size == 0 handling outside DSP function.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 15:30:01 +02:00
Michael Niedermayer
cc92372722 doc/APIchanges: lengthening a hash to make it non ambigous
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 13:11:32 +02:00
Michael Niedermayer
7448afc52b APIchanges: fillin some missing data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 13:10:23 +02:00
Michael Niedermayer
823ea19a74 Merge commit '39975acc699c83af0a87a7318c0f41e189142938'
* commit '39975acc699c83af0a87a7318c0f41e189142938':
  rtpenc_jpeg: check for color_range too

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 12:40:01 +02:00
Michael Niedermayer
e925a82e24 Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'
* commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12':
  apichanges: fill in changes for lavu 51.19 and 51.20

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 12:33:07 +02:00
Vittorio Giovara
39975acc69 rtpenc_jpeg: check for color_range too 2014-06-28 01:51:14 -04:00
Vittorio Giovara
f134b5ec53 apichanges: fill in changes for lavu 51.19 and 51.20 2014-06-28 01:50:17 -04:00
Michael Niedermayer
504475f38e avcodec/mpegvideo: dont overwrite emu_edge buffer
Fixes vsynth3 fate failures on mips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 06:28:21 +02:00
Michael Niedermayer
21bfed5b06 avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in encode_mb_internal 2014-06-28 06:27:15 +02:00
Michael Niedermayer
5bca5f87d1 Revert "x86/videodsp: add emulated_edge_mc_mmxext"
The commit causes minor out of array reads and was mainly intended for
future optimizations which turned out not to be meassurably faster.
Itself it was just 1 cpu cycle faster

Approved-by: jamrial

This reverts commit 057d2704e7.
2014-06-28 05:39:07 +02:00
Michael Niedermayer
4d1fa38d98 avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the resolution changes
Fixes Ticket3743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 00:16:09 +02:00
Michael Niedermayer
8c22bea574 avcodec/vp8: Fix multiple ff_thread_finish_setup() calls
Fixes Ticket3725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 22:45:43 +02:00
Michael Niedermayer
1fd0e9a56d Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
  mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

Conflicts:
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 19:24:44 +02:00
Michael Niedermayer
3ac5114530 Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
  dv: Properly split decoder and encoder initialization

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 19:13:34 +02:00
Sergey
6d2df3c00a ffmpeg: fix deadlock regression in threading error handing
Commit fc9c857c introduced deadlock regression when processing too many inputs:
  ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null -
Happens for different number of inputs, depending on available memory size,
overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds,
that exhaust address space allocating 8-10 MB stack for each thread.
Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message.

This patch fixes both problems: it frees the queue to prevent deadlock
and adds a meaningful error message if pthread_create() fails.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 17:45:38 +02:00
Anshul Maheshwari
263932c084 avcodec/dvbsubdec: fix ignoring blank frame by updating got_output
fix ticket 3737

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 14:35:58 +02:00
Diego Biurrun
5dd8c08fd5 mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter
This will come in handy during dsputil splitting.
2014-06-27 05:17:11 -07:00
Diego Biurrun
e63b818dbe dv: Properly split decoder and encoder initialization 2014-06-27 05:03:06 -07:00
James Almer
5fef4afb85 configure: add missing audiodsp dependency for ra144
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 13:37:10 +02:00
James Almer
607c88126c configure: fix g729 decoder dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 13:36:50 +02:00
James Almer
a6b8aef0dc configure: remove duplicate ape_decoder_select line
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 13:36:37 +02:00
Michael Niedermayer
b96c9513f3 avcodec/snow: factor ff_snow_get_buffer() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 04:49:09 +02:00
Gaullier Nicolas
134beb9e02 avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10
Approved-by: Tomas Härdin <tomas.hardin@codemill.se>
Approved-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 03:29:51 +02:00
Michael Niedermayer
09a7a4704e Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'
* commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133':
  dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 03:05:33 +02:00
Michael Niedermayer
5a636383db Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'
* commit '24f45c16224d4c5d482e928676714766ffdda4fc':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
	libavcodec/fft-test.c
	tests/fate/fft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 02:36:45 +02:00
Michael Niedermayer
357168bcf6 Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
  indeo4: B-frames decoding

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 02:05:22 +02:00
Diego Biurrun
d2869aea04 dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory 2014-06-26 16:15:07 -07:00
Michael Niedermayer
826726b83f Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'
* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 01:11:59 +02:00
Diego Biurrun
24f45c1622 fate: Add dependencies for dct/fft/mdct/rdft tests 2014-06-26 16:03:21 -07:00
Michael Niedermayer
ad081e4def Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'
* commit 'a5864e9a253143437471dba61a533e7fa9acec1c':
  output example: free the muxing format context properly

See: 9b211c43dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 01:02:40 +02:00