virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
61,852 Commits 37 Branches 400 Tags 462 MiB
f38af0143c
Commit Graph

61852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos
5e3689caed Add the H.264 decoder as a dependency for the fate-mkv test. 2014-03-19 03:00:19 +01:00
Carl Eugen Hoyos
57fdc74c34 Add one forgotten named inline asm operand in libavcodec/x86/motion_est.c. 2014-03-19 03:00:19 +01:00
Michael Niedermayer
ce9d3daa8a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aarch64: float_dsp NEON assembler

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 02:52:08 +01:00
Michael Niedermayer
a2339ef7b9 Merge commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c' 
* commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c':
  libopenjpeg: Support rgba64 decoding

See: b7a928b2d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 02:43:04 +01:00
Michael Niedermayer
1d8e97c79c Merge commit '8f45bd1433a1d8534d7b3997219c4ca31a669042' 
* commit '8f45bd1433a1d8534d7b3997219c4ca31a669042':
  libopenjpeg: Support rgba64 encoding

Conflicts:
	libavcodec/libopenjpegenc.c

See: 36397ea1c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 01:32:05 +01:00
Michael Niedermayer
543a46e0d1 Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0' 
* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
  libopenjpeg: K&R formatting cosmetics

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 01:06:29 +01:00
Matt Oliver
8236747511 Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported. 
This is part of the patch-set for intel C inline asm on windows support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 23:39:30 +01:00
Matt Oliver
b2d3a45598 avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported 
This is part of the patch-set for intel C inline asm on windows support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 23:37:50 +01:00
Janne Grunau
dbd12523a4 aarch64: float_dsp NEON assembler 
Ported from arm NEON and added vector_dmul_scalar.

Functions between 1.5 and 5 times faster than the C implementations
using Apple's clang-503.0.19 on A7.
 2014-03-18 22:56:07 +01:00
Carl Eugen Hoyos
37c07d4529 swscale/utils: Fix color range of gray16 
Improves rgb -> gray16 conversion

Fixes Ticket3422

The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 22:15:15 +01:00
Vittorio Giovara
1b51b7ba00 libopenjpeg: Support rgba64 decoding 2014-03-18 21:54:31 +01:00
Carl Eugen Hoyos
8f45bd1433 libopenjpeg: Support rgba64 encoding 2014-03-18 21:54:31 +01:00
Vittorio Giovara
1ea9fa15c3 libopenjpeg: K&R formatting cosmetics 2014-03-18 21:54:25 +01:00
Michael Niedermayer
05d7059ac6 avcodec/h264pred_template: fix declarations after statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 20:53:37 +01:00
Yogender Kumar Gupta
6f7ca1f55b avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction 
This is limited to the case where x264_build = -1, to not break x264 decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 20:37:26 +01:00
Michael Niedermayer
7ab315ec69 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  float_dsp: add test program and use it as fate test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 20:04:28 +01:00
Michael Niedermayer
61ad2b42a1 Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1' 
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 19:59:00 +01:00
Michael Niedermayer
ae9b468b08 Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07' 
* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 19:52:44 +01:00
James Almer
3d48cbc56c swresample: reuse COMMON_CORE asm where possible 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 16:08:34 +01:00
Daniel Verkamp
cf3fccce06 ff_put_wav_header: remove manual byte counting 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 15:54:37 +01:00
James Almer
7c8bf09edd swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2 
pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 15:00:50 +01:00
Michael Niedermayer
c56d25c476 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  svq3: directly set pix_fmt and color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 14:08:40 +01:00
Michael Niedermayer
7ae5cadb0a Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065' 
* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
  mpegts: Forward error codes in various functions

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 13:30:20 +01:00
Michael Niedermayer
ceb0d79f46 Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a' 
* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 13:19:24 +01:00
Janne Grunau
f0f687446e float_dsp: add test program and use it as fate test 2014-03-18 13:08:00 +01:00
Janne Grunau
d961a79eb0 sbrdsp: move #if to disable all educational code 
Avoids a warning of the unused function 'autocorrelate'.
 2014-03-18 13:08:00 +01:00
Janne Grunau
c829b35c08 lavc: er: remove unused variable size 
The code using it was removed in d66e305bd1.
 2014-03-18 13:07:52 +01:00
Vittorio Giovara
3795ec6858 svq3: directly set pix_fmt and color_range 2014-03-18 08:21:29 +01:00
Keiji Costantini
ca80e15814 mpegts: Forward error codes in various functions 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-18 08:20:35 +01:00
Keiji Costantini
86ba2327e1 mpegts: K&R formatting cosmetics 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-18 08:07:43 +01:00
Michael Niedermayer
48f7d5f0cf avfilter/src_movie: Check that the pixel format hasnt changed 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 03:59:20 +01:00
Michael Niedermayer
aa86cccd11 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:07:24 +01:00
Marton Balint
2daf6be011 MAINTAINERS: add myself az mpegts demuxer maintainer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:05:44 +01:00
Michael Niedermayer
8ab8070784 avcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2() 
This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-18 02:03:30 +01:00
Carl Eugen Hoyos
bb97bcec6b Fix TARGET_SAMPLES and TARGET_PATH for some fate tests. 
This allows running more fate tests on remote targets
without the source tree.
 2014-03-18 01:29:50 +01:00
James Almer
aa1f38015c x86/synth_filter: improve FMA version 
Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 21:04:15 +01:00
Andrey Utkin
e10ab43614 doc/examples: Add example transcoding.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 20:56:33 +01:00
Michael Niedermayer
e21235f9b9 avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd 
This also moves mov_rewrite_dvd_sub_extradata() to mov.c

Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 18:36:25 +01:00
Michael Niedermayer
8ba432bc56 avformat/mov: fill in subtitle dimensions after parsing tkhd 
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 18:21:11 +01:00
Michael Niedermayer
b6ad5893ce avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() 
Fixes regression with NeroRecodeSample.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:09:33 +01:00
Michael Niedermayer
f6f3c85c0e avformat/isom: Simplify mov_rewrite_dvd_sub_extradata() 
This avoids the 2nd buffer and fixes the palette truncated check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:06:30 +01:00
Michael Niedermayer
b1eb92a6bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: check color_range

Conflicts:
	libavcodec/libx264.c

See: 48d39c8786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:33:28 +01:00
Michael Niedermayer
34e325efa5 Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24' 
* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
  ljpeg: check color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:23:01 +01:00
Michael Niedermayer
987b873049 Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd' 
* commit '2183432e6dc8aedf1ef3db63006a2a8195479abd':
  mdec: set color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:14:28 +01:00
Michael Niedermayer
020baa0be6 Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347' 
* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e262e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 16:12:25 +01:00
Michael Niedermayer
ca0e6fa731 Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181' 
* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
	libavcodec/fraps.c

See: 79f452f4e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:58:02 +01:00
Michael Niedermayer
1c79ca272d Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4' 
* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
  tiff: Support rgba encoding

Conflicts:
	libavcodec/tiffenc.c

See: d7fc100694
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:55:18 +01:00
Michael Niedermayer
ba7cdb970f Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851' 
* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df18270a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:51:45 +01:00
Michael Niedermayer
c738ffcf2c Merge commit '58c215961a9067bb670387bbd72286c30de04b93' 
* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

See: edf34c346e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:43:55 +01:00
Michael Niedermayer
3731c40989 Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9' 
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 15:33:17 +01:00