virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
30,420 Commits 37 Branches 400 Tags 464 MiB
9362b50941
Commit Graph

30420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
9362b50941 examples: move API examples to a dedicated dir in doc 2011-05-30 09:20:06 +02:00
Stefano Sabatini
f712f6c8a4 ffmpeg: simplify opt_*_codec() options 
Replace opt_{audio,video,subtitle,data}_codec() with a single
opt_codec() function.
 2011-05-30 09:09:56 +02:00
Stefano Sabatini
7533a727f9 v4l2: rewrite code iterating the supported standards 
Simplify/clarify the code logic and error reporting.
 2011-05-30 09:08:42 +02:00
Stefano Sabatini
2d48515eb7 v4l2: perform minor style fixes 2011-05-30 09:08:42 +02:00
Stefano Sabatini
7b017086d4 v4l2: replace memset() with explicit struct initialization 2011-05-30 09:08:42 +02:00
Stefano Sabatini
50fee0fc8b rawdec: fail in case of unknow pixel format 2011-05-30 09:07:43 +02:00
Stefano Sabatini
e1197b9e17 swscale: remove sws_format_name() 
Use av_get_pix_fmt_name() instead.
 2011-05-30 09:07:43 +02:00
Michael Niedermayer
2c10ee2358 error.c: fix compile flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 03:11:54 +02:00
Michael Niedermayer
35bed44fc9 TCP: change default timeout to 5sec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 02:39:26 +02:00
Michael Niedermayer
a22500744b Revert "Timeout TCP open() after 5 seconds." 
This code is redundant and conflicts with lucas reimplementation of it.

This reverts commit a2f5e14a86.
 2011-05-30 02:36:49 +02:00
Michael Niedermayer
5a35cef4b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: enable UAL syntax in asm.S
  v4l2: don't leak video standard string on error.
  swscale: Remove disabled code.
  avfilter: Surround function only used in debug mode by appropriate #ifdef.
  vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
  build: remove BUILD_ROOT variable
  vp8: use av_clip_uintp2() where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 01:29:11 +02:00
Clément Bœsch
adba9c6352 Fix various unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:24:01 +02:00
Clément Bœsch
fd38a15adf Fix various bad printf format warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:03:06 +02:00
Mans Rullgard
371266daa3 ARM: enable UAL syntax in asm.S 
This enables UAL syntax for all asm files instead of only those
which happen to be incompatible with the old, deprecated syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 15:42:56 +01:00
Reimar Döffinger
bb9b7bc62e Remove now unused nb_istreams variable. 2011-05-29 15:33:48 +02:00
Reimar Döffinger
89c687e97e Add const to vector types for input in altivec code. 
Avoids a large amount of warnings about cast discarding qualifiers.
 2011-05-29 15:25:17 +02:00
Reimar Döffinger
4596d0f4c4 Remove unused variable, avoiding compiler warning. 2011-05-29 15:23:28 +02:00
Reimar Döffinger
54dc95634d Cast pointers to uintptr_t rather than unsigned int. 
Avoids potential warnings on PPC64 systems.
 2011-05-29 15:22:15 +02:00
Anton Khirnov
7a70e01b26 v4l2: don't leak video standard string on error. 2011-05-29 15:10:35 +02:00
Diego Biurrun
06b5facd4b swscale: Remove disabled code. 2011-05-29 14:32:08 +02:00
Diego Biurrun
d6e0729b24 avfilter: Surround function only used in debug mode by appropriate #ifdef. 
This fixes the warning:
libavfilter/avfilter.c:219: warning: ‘ff_get_ref_perms_string’ defined but not used
 2011-05-29 13:43:03 +02:00
Diego Biurrun
2146f4928a vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). 2011-05-29 13:43:02 +02:00
Mans Rullgard
798b264678 build: remove BUILD_ROOT variable 
This variable is unnecessary as absolute paths are not required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 12:36:16 +01:00
Michael Niedermayer
b8a43bc1b5 Merge remote-tracking branch 'qatar/master' into master 
* qatar/master: (27 commits)
  ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
  ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
  ac3dsp: fix loop condition in ac3_update_bap_counts_c()
  ARM: unbreak build
  ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
  ac3enc: split mantissa bit counting into a separate function.
  ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
  get_bits: add av_unused tag to cache variable
  sws: replace all long with int.
  ARM: aacdec: fix constraints on inline asm
  ARM: remove unnecessary volatile from inline asm
  ARM: add "cc" clobbers to inline asm where needed
  ARM: improve FASTDIV asm
  ac3enc: use LOCAL_ALIGNED macro
  APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
  lavu: add av_get_pix_fmt_name() convenience function
  cmdutils: remove OPT_FUNC2
  swscale: fix crash in bilinear scaling.
  vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
  webm: support stereo videos in matroska/webm muxer
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	doc/muxers.texi
	ffmpeg.c
	ffplay.c
	libavcodec/ac3enc.c
	libavcodec/ac3enc_float.c
	libavcodec/avcodec.h
	libavcodec/get_bits.h
	libavcodec/libvpxenc.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavformat/matroskaenc.c
	libavutil/avutil.h
	libswscale/rgb2rgb.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-29 03:34:35 +02:00
Mans Rullgard
4276112277 vp8: use av_clip_uintp2() where possible 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 02:10:05 +01:00
Michael Niedermayer
39d607e5bb swscale: Commits that could not be pulled earlier due to bugs #2 
commit 5a5a0f1613
Author: Diego Biurrun <diego@biurrun.de>
Date:   Fri May 27 19:46:39 2011 +0200

    swscale: Remove unused variables in x86 code.

    libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’
    libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’
    libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’
    libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’

commit 389e2000eb
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 12:23:32 2011 -0400

    swscale: delay allocation of formatConvBuffer().

    That means it won't be allocated when not needed. Alongside
    this, it fixes valgrind/fate-detected memory leaks.

commit f327bfa6dc
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 11:36:43 2011 -0400

    swscale: fix build with --disable-swscale-alpha.

commit 9f5d45025e
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 09:28:38 2011 -0400

    swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
 2011-05-29 02:14:45 +02:00
Michael Niedermayer
986f0d86cb Commits that could not be pulled earlier due to bugs. 
commit 93681fbd50
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 11:32:32 2011 -0400

        swscale: fix compile on ppc.

    commit e758573a88
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 10:36:47 2011 -0400

        swscale: fix compile on x86-32.

    commit 0f4eb8b043
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 09:17:52 2011 -0400

        swscale: remove VOF/VOFW.

    commit b4a224c5e4
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Wed May 25 14:30:09 2011 -0400

        swscale: split chroma buffers into separate U/V planes.

        Preparatory step to implement support for sizes > VOFW.
 2011-05-29 02:13:36 +02:00
Michael Niedermayer
ea535ed50d Revert 1a5e4fd8c5 for postproc. This broke the code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-29 00:32:33 +02:00
James Zern
011b098cd0 doc: correct AC-3 option subsection placement 
Floating-Point-Only section was added after the video encoders chapter
in 034fc7b merge.
 2011-05-29 00:32:26 +02:00
Mans Rullgard
90da52f01f ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 21:42:31 +01:00
Justin Ruggles
70bb747a57 ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. 
this should fix the windows builds

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-28 22:43:40 +03:00
Ronald S. Bultje
9222dddb44 swscale: use av_clip_uint8() in yuv2yuv1_c(). 2011-05-28 21:43:33 +02:00
Ronald S. Bultje
485d73ef21 swscale: replace formatConvBuffer[VOF] by allocated array. 
This allows to convert between formats of arbitrary width,
regardless of the value of VOF/VOFW.
 2011-05-28 21:43:33 +02:00
Stefano Sabatini
895e4de8d5 v4l2: create file @doxy from text in the copyright header 2011-05-28 21:18:09 +02:00
Stefano Sabatini
72c60f3ecd v4l2: remove pointless empty lines 2011-05-28 21:18:09 +02:00
Stefano Sabatini
af344a69f3 v4l2: set default standard to NULL 
Avoid a failure with the default value of "NTSC". Not all drivers
support a standard.
 2011-05-28 21:18:01 +02:00
Stefano Sabatini
f8f3f6c40b v4l2: use OFFSET macro when setting options 
Improve readability.
 2011-05-28 21:16:47 +02:00
Justin Ruggles
dc0ad40de2 ac3dsp: fix loop condition in ac3_update_bap_counts_c() 2011-05-28 14:41:21 -04:00
Mans Rullgard
edfa89b260 ARM: unbreak build 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 18:41:20 +01:00
Stefano Sabatini
b2a6f25c67 lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
Justin Ruggles
6ca23db9cc ac3enc: modify mantissa bit counting to keep bap counts for all values of bap 
instead of just 0 to 4.

This does all the actual bit counting as a final step.
 2011-05-28 12:39:28 -04:00
Justin Ruggles
1323828a0f ac3enc: split mantissa bit counting into a separate function. 
No speed difference. This is to allow for more flexible bit counting.
 2011-05-28 12:39:28 -04:00
Justin Ruggles
7743865ffc ac3enc: store per-block/channel bap pointers by reference block in a 2D array 
rather than in the AC3Block struct.

This will make it easier to access the bap values without having to chase
the reference block pointers each time.
 2011-05-28 12:39:28 -04:00
Stefano Sabatini
e71f26086a lavu: add av_get_pix_fmt_name() convenience function 
Also deprecate avcodec_get_pix_fmt_name() in its favor.
 2011-05-28 18:25:40 +02:00
Stefano Sabatini
34e9c9b111 iff: remove duplicated file description 2011-05-28 18:23:35 +02:00
Stefano Sabatini
eb8bc57240 cmdutils: remove OPT_FUNC2 
Make ff* tools only accept opt_* functions taking two arguments.

The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
 2011-05-28 18:23:05 +02:00
Mans Rullgard
e01e05ee66 get_bits: add av_unused tag to cache variable 
This silences numerous compiler warnings from skip_bits(),
where the cache variable is not used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 17:04:47 +01:00
Anton Khirnov
b8e893399f sws: replace all long with int. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-28 10:03:37 -04:00
Mans Rullgard
7d8c17b5f6 ARM: aacdec: fix constraints on inline asm 
This adds output operands for modified memory allowing the
volatile qualifiers to be dropped.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 15:00:17 +01:00
Mans Rullgard
84e4804ad0 ARM: remove unnecessary volatile from inline asm 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 15:00:17 +01:00