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
28,983 Commits 37 Branches 400 Tags 464 MiB
a2beabc231
Commit Graph

69 Commits

Author SHA1 Message Date
Michael Niedermayer
2cae9809e2 Merge remote branch 'qatar/master' 
* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
	doc/filters.texi
	libavcodec/ac3enc_fixed.h
	libavcodec/ac3enc_float.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-04 02:15:12 +02:00
Anton Khirnov
8978fedaee avio: introduce an AVIOContext.seekable field 
Use it instead of url_is_streamed and AVIOContext.is_streamed.
 2011-04-03 22:46:40 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Michael Niedermayer
4118d66cb3 Revert "lavf: deprecate get_strz() in favor of avio_get_str" 
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76.
 2011-03-06 02:16:00 +01:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
773947ba76 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716)
 2011-03-05 02:29:28 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
e16ead0716 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:02 -05:00
Anton Khirnov
74b3f67c9c lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
 2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
 2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Reimar Döffinger
e36a39066c Move ffm_close function up to avoid a forward declaration. 
Originally committed as revision 24491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 07:54:33 +00:00
Reimar Döffinger
527b46ba26 ffmdec: Do not manually free streams on read_header error, this is always 
handled by upper layers.
Fixes double-frees (issue 2003).
Instead call ffm_close to ensure rc_eqs are freed also in the error case.

Originally committed as revision 24490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 07:52:58 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Ronald S. Bultje
a7a85dc4c2 Cast sample_fmt (as read from bitstream as a 16-bit value) to int16, so that 
negative values, e.g. SAMPLE_FMT_NONE (-1), are read correctly also.

Originally committed as revision 22585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 15:14:18 +00:00
Benoit Fouet
114a93c700 Fix ffm_close return type. 
Originally committed as revision 22432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 14:26:15 +00:00
Vitor Sessak
2dc22a64b4 Fix memory leak in FFM demuxer 
Originally committed as revision 22431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 13:17:50 +00:00
Benjamin Larsson
8c0c11229e Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes 
streaming to ffserver work again.

Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 21:08:21 +00:00
Jason Garrett-Glaser
d2b34efe22 Update ffserver to include all basic x264 parameters in .ffm files. 
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-24 15:54:17 +00:00
Aurelien Jacobs
ed54ae08b8 remove useless duplication of what av_new_stream() already does 
Originally committed as revision 18416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 12:49:53 +00:00
Baptiste Coudurier
be2a6e2f82 fix compilation when DEBUG_SEEK is defined 
Originally committed as revision 18099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 07:36:25 +00:00
Baptiste Coudurier
92a0f33878 fix valid seeking range 
Originally committed as revision 18098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 07:35:52 +00:00
Baptiste Coudurier
7c45723a98 resync ffm if error in stream 
Originally committed as revision 18065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:44:45 +00:00
Baptiste Coudurier
21c6438f2c typo, fix eof check 
Originally committed as revision 18064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:39:55 +00:00
Baptiste Coudurier
b9edbe9953 do not write ffm write index by default, detect if file is being written and return EOF 
Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:23:33 +00:00
Baptiste Coudurier
2dc9188465 return error if read failed 
Originally committed as revision 17173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 02:17:16 +00:00
Patrik Kullman
6fcce4f995 Change ffm_write_write_index to return int, and return if error occured. 
Patch by Patrik Kullman, patrik at yes dot nu

Originally committed as revision 17172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 02:15:07 +00:00
Baptiste Coudurier
eee99eb3e8 return eof/error if only ffm header has been written, should fix #815 
Originally committed as revision 16924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 22:02:57 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Stefano Sabatini
af274fd1e1 Improve long names for FFM muxer and demuxer: 
change "ffm format" to "FFM (FFserver live feed) format".

Originally committed as revision 14438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-27 20:59:40 +00:00
Baptiste Coudurier
fabb990ec2 cosmetics, pts->dts 
Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 08:53:44 +00:00
Baptiste Coudurier
dbedf2aae2 enable feeder threads 
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:35:43 +00:00