virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
41,458 Commits 37 Branches 400 Tags 460 MiB
8554e21f79
Commit Graph

41458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
8554e21f79 ffv1enc: add yuva422p to .pix_fmts 
This was forgotten in 4e4634aa16.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 18:15:50 +00:00
Michael Niedermayer
94632dbb1e Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 20:09:56 +02:00
J. Bohl
2138bc16fd remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 20:09:43 +02:00
Paul B Mahol
a474403229 libopenjpegdec: unbreak yuva420p support 
Regression introduced in b7a928b2d1.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 18:06:09 +00:00
Marton Balint
143a5390bf ffplay: fix return value of get_video_frame if avcodec_decode_video fails 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-06-09 19:45:10 +02:00
Paul B Mahol
7655cc395d colorspace-test: add few more tests 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 14:38:51 +00:00
Michael Niedermayer
b0415287e3 float_dsp.c: Restore author attribution that was removed by libav while moving code to libavutil 
Original code comes from:
commit eb4825b5d4
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 0bde73d907
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue May 17 19:02:43 2005 +0000

    Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 16:09:47 +02:00
Michael Niedermayer
f0313e9022 x86/float_dsp.asm: restore author attribution 
The attribution was removed by libav while moving the code to libavutil

The original code is from
commit eb4825b5d4
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 069720565c
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Fri Aug 11 18:19:37 2006 +0000

    vorbis simd tweaks

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 16:09:11 +02:00
Michael Niedermayer
1b7a4c93a9 lavc/bintext: check extradata size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 15:04:12 +02:00
Michael Niedermayer
c61c8536ef lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 14:36:41 +02:00
Michael Niedermayer
eae983f4ff ffmpeg: fix fate breakage introduced by key=value buffersrc args. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 14:02:27 +02:00
Paul B Mahol
1d69dcb887 swscale: unscaled rgb48 <-> bgr48 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 11:55:52 +00:00
Paul B Mahol
e400b95b32 bink: check av_mallocz() return value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 10:57:14 +00:00
Paul B Mahol
c2dd01c16f binkaudio: prevent extradata overread 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-09 10:43:20 +00:00
Nicolas George
6fef82f22d ffmpeg: with filter_complex, avoid random in<->out mapping. 
With complex filters, an output can come from any input,
or several inputs, including inputs of a different type.
Copying the codec parameters from the first input with
the same type does not make any sense.

This does not change anything for simple 1->1 filters,
as source_index is set in that case.
 2012-06-09 08:42:50 +02:00
Nicolas George
fbaa8fe6c6 ffmpeg: init icodec. 
With complex filter graphs, it can end up accessed
without having been set.
 2012-06-09 08:42:50 +02:00
Nicolas George
8362d734a3 ffmpeg: use the frame rate computed by lavfi. 
This frame rate is more reliable than the one copied
from the input stream, so it is used in priority.
 2012-06-09 08:42:50 +02:00
Nicolas George
5f281e94ba ffmpeg: add frame rate to the buffersrc arguments. 
The arguments now use the key=value syntax.
 2012-06-09 08:42:50 +02:00
Nicolas George
0f62125643 buffersrc: deprecate flat options syntax. 2012-06-09 08:42:50 +02:00
Nicolas George
9ca440679d buffersrc: accept the frame rate as argument. 2012-06-09 08:42:50 +02:00
Nicolas George
dcaa4efcee buffersrc: accept key=value arguments. 
The current flat arguments syntax is not easily extensible
due to sws_param possibly containing commas.
This is also consistent with abuffersrc.
 2012-06-09 08:42:50 +02:00
Nicolas George
283cc05938 buffersink: add av_buffersink_get_frame_rate(). 2012-06-09 08:42:50 +02:00
Nicolas George
7b42036b3b lavfi: add a frame_rate field to AVFilterLink. 2012-06-09 08:42:50 +02:00
Michael Niedermayer
04e2ac4749 libavutil.v: add avpriv prefix 
This should fix the fate failure
http://fate.ffmpeg.org/log.cgi?time=20120609002213&log=compile&slot=x86_64-archlinux-gcc-enableshared

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:51:02 +02:00
Michael Niedermayer
a5c6349358 swr: skip memset(0) in rematrix when the array is known to be already 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:43:10 +02:00
Michael Niedermayer
75d900d52e swr: zero buffers on allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:42:46 +02:00
J. Bohl
023c073076 add bracket around the argument (fixes compilation error with ICL) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 00:34:21 +02:00
Michael Niedermayer
690ea9359d Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: reset AVFrame to defaults before decoding each new frame.
  ffplay: check return code of avcodec_decode_video2()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 00:28:20 +02:00
Michael Niedermayer
7e22514d98 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 23:59:09 +02:00
Michael Niedermayer
e016e3c9d7 swr: add mix8to2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:12:00 +02:00
Michael Niedermayer
b0348158a0 swr: 5.1->stereo double, float and s16 
2.5 times faster than the generic code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:02:14 +02:00
Michael Niedermayer
ca30ae12c5 swr: add all in one rematrixing function ptr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:55:33 +02:00
Michael Niedermayer
dfde3d497e swr: add inrermediate sample type for rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:54:54 +02:00
Michael Niedermayer
cb819338d1 ffplay: reset AVFrame to defaults before decoding each new frame. 
This fixes: ffplay -f lavfi -i cellauto
This was a regression since factorizing the filter code with ffmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-06-08 21:32:10 +02:00
Michael Niedermayer
349b65eee2 ffplay: check return code of avcodec_decode_video2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-06-08 21:32:10 +02:00
Justin Ruggles
3b81a18ba3 float_dsp: ppc: add a separate header for Altivec function prototypes 
Also include config.h so that HAVE_ALTIVEC will be defined.
Fixes compilation on PPC with Altivec enabled.
 2012-06-08 14:52:01 -04:00
Mans Rullgard
a839d6abf8 ARM: fix float_dsp breakage from d5a7229 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-06-08 19:45:37 +01:00
Justin Ruggles
d5a7229ba4 Add a float DSP framework to libavutil 
Move vector_fmul() from DSPContext to AVFloatDSPContext.
 2012-06-08 13:14:38 -04:00
Justin Ruggles
98db4e2a4e PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil 
This will allow for easier implementation of Altivec functions in libraries
other than libavcodec.
 2012-06-08 13:14:38 -04:00
Justin Ruggles
94d2b0d2fd ARM: Move asm.S from libavcodec to libavutil 
This will allow for easier implementation of ARM-optimized functions in
libraries other than libavcodec.
 2012-06-08 13:14:38 -04:00
Michael Niedermayer
718607be28 rv10: change assert() to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 18:24:47 +02:00
Mike Scheutzow
1be7bfdd2b ffmpeg.c: fix erroneous "Output file is empty" message. 
This message is printed whenever the RAWVIDEO codec is used, whether the
output file contains any frames or not. Test command:
./ffmpeg -i infile.y4m outfile.y4m

Signed-off-by: Mike Scheutzow <mjs973@optonline.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 18:22:40 +02:00
Paul B Mahol
134d0f7119 Revert "Fix building libopencore_amrnb decoder without libopencore_amrnb encoder" 
Reverting "Fix" because it disables amrwb decoder.

This reverts commit e11020a145.
 2012-06-08 13:55:30 +00:00
Carl Eugen Hoyos
b35d38bd04 Add iac build dependency. 
Found and analysed by trac user Jamal.

Fixes the remaining part of ticket #1428.
 2012-06-08 15:29:24 +02:00
Carl Eugen Hoyos
37a9cdfc2c Fix dirac decoder build dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:24 +02:00
Carl Eugen Hoyos
8a880d6918 Fix latm muxer Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Carl Eugen Hoyos
b8e2dcd266 Fix jacosub muxer Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Carl Eugen Hoyos
b8fe9f08be Fix amv encoder dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of ticket #1428.
 2012-06-08 15:29:23 +02:00
Paul B Mahol
e11020a145 Fix building libopencore_amrnb decoder without libopencore_amrnb encoder 
Fixes #1210.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-08 13:03:10 +00:00
Paul B Mahol
f4e0ec814b pixdesc: BGRA64 is rgb pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-08 10:42:27 +00:00