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
64,595 Commits 37 Branches 400 Tags 464 MiB
eca1957c4c
Commit Graph

64595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e2abc0d5ca Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d' 
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 23:16:06 +02:00
Michael Niedermayer
43c57dbe14 Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58' 
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:34:16 +02:00
Michael Niedermayer
d84286b1ea Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0' 
* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
  on2avc: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:29:11 +02:00
Michael Niedermayer
5be8c27694 avformat/rtspdec: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Michael Niedermayer
2870617853 avcodec/vp3: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Michael Niedermayer
0674da997a avcodec/cavs: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Lou Logan
8a64ea768b doc/filters: amix only supports float samples 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-27 10:23:57 -08:00
Andrew Kelley
9767d7c092 oggenc: Flush after writing headers 
Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:59 +03:00
Andrew Kelley
1d3eb0b573 oggenc: Move ogg_write_pages up above ogg_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-27 20:16:58 +03:00
Michael Niedermayer
1853e2cba9 avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 18:22:09 +02:00
Diego Biurrun
512f3ffe9b dsputil: Split off HuffYUV encoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:54:53 -07:00
Diego Biurrun
0d439fbede dsputil: Split off HuffYUV decoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:52:34 -07:00
Michael Niedermayer
0d26264fb4 avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:52:24 +02:00
Michael Niedermayer
ee0c91cc65 avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:36 +02:00
Michael Niedermayer
515e8aed03 avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:21 +02:00
Michael Niedermayer
e10ac3a12e avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:45:07 +02:00
Michael Niedermayer
cfa0ad6eec avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:45 +02:00
Michael Niedermayer
1dbc98461b avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:15 +02:00
Michael Niedermayer
c0f8801e47 avfilter/il: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:44:02 +02:00
Michael Niedermayer
5feac96fdb avfilter/hflip: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:46 +02:00
Michael Niedermayer
f3fdc32e2f avfilter/crop: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:32 +02:00
Michael Niedermayer
64fb19cc99 avfilter/formats: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 17:43:03 +02:00
Andreas Cadhalpun
0f17bc644c Improve the detection of architecture x86. 
This fixes building on Debian GNU/Hurd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 16:28:04 +02:00
James Almer
5863207086 x86/dsputilenc: use HADDD in ff_sse16_sse2 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 15:12:50 +02:00
Diego Biurrun
888dcd8675 h264_picture: Remove pointless dsputil.h #include 2014-05-27 03:12:17 -07:00
Diego Biurrun
f1df0a4c08 on2avc: Remove pointless dsputil.h #include 2014-05-27 03:12:17 -07:00
James Almer
e64e079ece x86/dsputilenc: implement SSE2 version of diff_pixels 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 05:55:11 +02:00
Michael Niedermayer
a0c5cd3475 avcodec/x86/dsputilenc: set the count of SSE registers correctly for get_pixels 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 05:52:25 +02:00
Michael Niedermayer
a1cb4efd2f Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156' 
* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
  lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 03:23:23 +02:00
Michael Niedermayer
50ffd8439c Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444' 
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
  buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:
	libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 03:18:27 +02:00
Michael Niedermayer
cdf6a9441d Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3' 
* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
  vf_fieldorder: avoid using AV_PIX_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 03:02:37 +02:00
Michael Niedermayer
de5ec08825 Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8' 
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:54:58 +02:00
Michael Niedermayer
a37f2cc579 avfilter/vf_format: fix duplicate ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:53:17 +02:00
Michael Niedermayer
6e9dbee7c6 Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece' 
* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:46:56 +02:00
Michael Niedermayer
e222cfefcd Merge commit '4d8c28deab2488579f585406110b1be790896e59' 
* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

See: 4d8c28deab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 02:27:35 +02:00
Michael Niedermayer
e6a084641a avformat/utils: set max analyze duration depending on the circumstances 
Fixes Ticket3673

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 22:33:01 +02:00
Michael Niedermayer
52887aa409 avformat: move default for max_analyze_duration into utils.c 
this way we can do better tha a single fixed constant value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 22:33:01 +02:00
Anton Khirnov
7cc4c9f32f lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB 
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
 2014-05-26 22:25:47 +02:00
Anton Khirnov
b03b2d86aa buffersrc: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:41 +02:00
Anton Khirnov
a7d070acb5 vf_fieldorder: avoid using AV_PIX_FMT_NB 
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
 2014-05-26 22:25:26 +02:00
Anton Khirnov
862f33c10e vf_scale: use the pixfmt descriptor API 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:24:46 +02:00
Anton Khirnov
45fc73edfe vf_format: rework format list parsing 
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
 2014-05-26 22:22:42 +02:00
Lou Logan
60ef61242c MAINTAINERS: add Trac maintainers 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-26 12:18:29 -08:00
Lou Logan
5b1a56b34b doc/ffmpeg: note that -t is also an input option 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-26 12:11:34 -08:00
Lou Logan
2dbf5e7038 configure: s/solving/solve 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-26 11:54:35 -08:00
Clément Bœsch
53bac1b4bd doc: add a tutorial for writing filters. 2014-05-26 21:28:19 +02:00
Michael Niedermayer
d35000c2dc avcodec/g723_1: fix writing into input frame data and warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 21:05:03 +02:00
Carl Eugen Hoyos
2d56f0d054 Write the actual mp3 frame size when muxing into caf if available. 
Fixes ticket #3648.
 2014-05-26 20:28:07 +02:00
Michael Niedermayer
2db89765f3 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  ffmpeg: use thread message API.
  lavu: add thread message API.
  compat/w32pthreads: add return value to pthread_cond_init().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 16:35:52 +02:00
Neil Armstrong
99d742aac4 configure: uClibc native pthread requires -ldl 
In the configure script, add a pthread detection with
-ldl added to cflags, because uClibc requires -ldl to
link with native libpthread.

Tested with a custom ARM toolchain with uClibc 0.9.33.2 and gcc 4.6.3.

Signed-off-by: Neil Armstrong <narmstrong@neotion.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-26 16:00:25 +02:00