virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
30,698 Commits 37 Branches 400 Tags 470 MiB
36204ed88e
Commit Graph

30698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mans Rullgard
5726ec171b ARM: add "cc" clobbers to inline asm where needed 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 15:00:17 +01:00
Mans Rullgard
a84f82560e ARM: improve FASTDIV asm 
This uses one register less.  Also add missing "cc" clobber.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 15:00:17 +01:00
Mans Rullgard
7f7726c7a2 ac3enc: use LOCAL_ALIGNED macro 
Aligned local variables must use the LOCAL_ALIGNED macro to ensure
correct alignment on all systems.  The unusual size argument to
memset is required since the implementation of LOCAL_ALIGNED may
use a pointer to an array.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-28 15:00:16 +01:00
Ronald S. Bultje
04de5bf56c APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). 2011-05-28 09:46:42 -04:00
Stefano Sabatini
8f653e28f5 lavu: add av_get_pix_fmt_name() convenience function 
Also deprecate avcodec_get_pix_fmt_name() in its favor.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-28 09:44:18 -04:00
Stefano Sabatini
26513856d6 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.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-28 09:40:19 -04:00
Ronald S. Bultje
009f829dde swscale: fix crash in bilinear scaling. 2011-05-28 08:59:56 -04:00
James Zern
88aa215939 vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping 
via the equivalent AVCodecContext::mb_threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-28 12:15:59 +02:00
Alok Ahuja
945dda41a2 webm: support stereo videos in matroska/webm muxer 
Create a stereo_mode metadata tag to specify the stereo 3d video layout
using the StereoMode tag in a matroska/webm video track.
 2011-05-28 12:15:55 +02:00
Ronald S. Bultje
78046dadc3 rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. 
Many functions have such a prefix, but do not actually use any
instructions or features from that set, thus giving the false
impression that swscale is highly optimized for a particular
system, whereas in reality it is not.
 2011-05-28 11:41:32 +02:00
Ronald S. Bultje
fc72ec727e swscale: reindent h[cy]scale_fast() and updateDitherTables(). 2011-05-28 11:41:25 +02:00
Ronald S. Bultje
c3f07903ec swscale: reformat x86/swscale_template.c. 
Interleave macros and code so that it's easier to find the
actual code that belongs to a function. Also reindent where
appropriate and remove dead code.
 2011-05-28 11:40:59 +02:00
Ronald S. Bultje
1dbf40c383 swscale: remove duplicate mmx/mmx2 functions if they are identical. 2011-05-28 11:34:59 +02:00
Ronald S. Bultje
264dcc63af swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). 
This allows cutting up the function in much smaller and easier-
to-maintain chunks.
 2011-05-28 11:32:29 +02:00
Ronald S. Bultje
f2a3b23051 swscale: remove if(full_chr_int) from yuv2packed1(). 
If that flag is set, swScale() already proxies the call to
yuv2rgbXinC_full(). Therefore, this flag is never set when
yuv2packed1() is called.
 2011-05-28 11:11:58 +02:00
Ronald S. Bultje
835ab9207e swscale: remove if(accurate_rnd) branch from functions. 2011-05-28 11:11:50 +02:00
Anton Khirnov
2b04858a10 swscale: revive SWS_CPU_CAPS until next major bump. 2011-05-28 11:11:29 +02:00
Diego Biurrun
11f2eae2ae swscale: Remove commented-out printf cruft. 2011-05-28 11:09:30 +02:00
Kieran Kunhya
5501afa6ee Export PCR pid 2011-05-28 04:11:26 +02:00
Kieran Kunhya
24adef142f Export more transport stream information. 
with minor addition to the comment by michael
 2011-05-28 04:11:26 +02:00
Kieran Kunhya
fa12fb3b00 Output MPEG-TS stream identifiers. 
with changes by michael to simplify API
 2011-05-28 04:11:26 +02:00
Michael Niedermayer
8381ab1437 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  ARM: disable ff_vector_fmul_vfp on VFPv3 systems
  ARM: check for VFPv3
  swscale: Remove unused variables in x86 code.
  doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
  x86: Add appropriate ifdefs around certain AVX functions.
  cmdutils: use sws_freeContext() instead of av_freep().
  swscale: delay allocation of formatConvBuffer().
  swscale: fix build with --disable-swscale-alpha.
  movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
  movenc: Add an AVClass for setting muxer specific options
  swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
  configure: report yasm/nasm presence properly
  tcp: make connect() timeout properly
  rawdec: factor video demuxer definitions into a macro.
  rtspdec: add initial_pause private option.
  lavf: deprecate AVFormatParameters.width/height.
  tty: add video_size private option.
  rawdec: add video_size private option.
  x11grab: add video_size private option.
  x11grab: factorize returning error codes.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-27 23:48:22 +02:00