virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
33,689 Commits 37 Branches 400 Tags 460 MiB
410c06d2f3
Commit Graph

87 Commits

Author SHA1 Message Date
Michael Niedermayer
f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-13 06:00:03 +02:00
Anton Khirnov
3b3ea34655 Remove all uses of deprecated AVOptions API. 2011-10-12 16:51:16 +02:00
Mohamed Naufal Basheer
f990dc374e Add the G723.1 demuxer and decoder 2011-09-29 21:44:03 +02:00
Michael Niedermayer
7c1aba4f01 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 02:14:37 +02:00
Rafaël Carré
1430ae44e8 rtp: Simplify ff_rtp_get_payload_type 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-26 21:55:27 +03:00
Rafaël Carré
9152880e95 rtpenc: Add a payload type private option 
Specifying the payload type is useful when the type number has
already been negotiated before creating the stream, for example
in SIP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-26 21:54:57 +03:00
Michael Niedermayer
a7758884db Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
	cmdutils.c
	libavcodec/proresdec_lgpl.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 01:03:07 +02:00
Rafaël Carré
0c378ea1f7 rtp: factorize dynamic payload type fallback 
Move the identical code in rtp_write_header() and
ff_sdp_write_media() inside ff_rtp_get_payload_type()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-09-23 22:00:24 +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
Martin Storsjö
0048a2a8d3 Handle G.722 in RTP, and all the exceptions mandated in RFC 3551 
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:35:39 +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
Luca Abeni
4bf0faaafe Remove the inclusion of unneeded headers 
Originally committed as revision 21152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 19:55:14 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Luca Abeni
215037887d Do not return payload type 34 for H.263 (it is deprecated) 
Originally committed as revision 18346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 06:37:12 +00:00
Luca Abeni
bf6d981806 Remame rtp_get_codec_info() to ff_rtp_get_codec_info(), as it is not 
a static function

Originally committed as revision 17390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 08:12:51 +00:00
Luca Abeni
0550b58f4e Rename rtp_get_payload_type() to ff_rtp_get_payload_type(), as it is not 
a static function

Originally committed as revision 17364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 09:36:21 +00:00
Luca Abeni
20631a9c15 Merge rtp_internal.h in rtp.h, and remove rtp_internal.h 
Originally committed as revision 16817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 12:23:16 +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
Luca Abeni
309d32b0db Do not set sample_rate = 90000 for mp2 and mp3 audio over RTP 
Originally committed as revision 13943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 11:07:04 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Luca Abeni
2ccf0a4290 Add a comment about missing entries 
Originally committed as revision 12646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 09:54:49 +00:00
Luca Abeni
87cb064359 Use the correct size for the enc_name field (removing the arbitrary "50" size) 
Originally committed as revision 12645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 09:49:58 +00:00
Luca Abeni
19faa9f469 Remove useless entries from AVRtpPayloadTypes 
Originally committed as revision 12644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 09:48:04 +00:00
Luca Abeni
e4ed1fbf91 Support mp3 audio in the RTP muxer 
Originally committed as revision 12643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 09:42:45 +00:00
Diego Pettenò
7d51edddd4 Make AVRtpPayloadTypes static and constant 
Patch by Diego 'Flameeyes' Pettenò (flameeyes AT gmail DOT com)

Originally committed as revision 11432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-06 10:00:04 +00:00
Luca Abeni
83a0d3878c Split the RTP muxer out of rtp.c, to simplify the RTSP demuxer's dependencies 
Originally committed as revision 11408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 20:09:48 +00:00
Luca Abeni
8eb793c459 Split the RTP demuxing functions out of rtp.c, to simplify the RTP muxer's dependencies 
Originally committed as revision 11406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 19:33:50 +00:00
Diego Biurrun
d0b53d05c8 Fix some spelling mistakes. 
Originally committed as revision 11125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-02 14:06:28 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Luca Abeni
db628029c4 Add MPEG2 support to the RTP muxer 
Originally committed as revision 11047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-16 13:13:53 +00:00
Luca Abeni
7ed19d7fbf Remove the "AVRtpPayloadTypes[i].pt == i" assumption from RTP and RTSP 
code (this is needed for supporting MPEG2 video in the RTP muxer)

Originally committed as revision 11046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-16 07:59:41 +00:00
Luca Abeni
18c05a375b Do not send too many RTCP packets (according to RFC 3550, the minimum 
RTCP interval should be 5 seconds)

Originally committed as revision 10930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-05 12:25:10 +00:00
Luca Abeni
0aa7a2e690 Use a symbolic name for the payload size of an RTCP Sender Report packet 
Originally committed as revision 10929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-05 10:15:20 +00:00
Luca Abeni
e0d21bfe83 Allow to set the maximum number of frames per RTP packet (and add support for 
this in the AAC packetizer)

Originally committed as revision 10647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-02 14:48:08 +00:00
Luca Abeni
d0c3be9568 Fix a warning by removing an useless assignment (buf_ptr should be only 
used in the RTP muxer, and not in the demuxer)

Originally committed as revision 10561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 10:43:26 +00:00
Luca Abeni
171dce486c Support for AAC streaming over RTP. Fragmentation is not implemented yet 
Originally committed as revision 10491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-14 08:17:06 +00:00
Luca Abeni
af74c95a08 Fix timestamps in RTP packets (now, MPEG1 video with B frames works correctly) 
Originally committed as revision 10469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-10 07:01:29 +00:00
Luca Abeni
1b31b02ed1 Properly set RTP and NTP timestamps in RTCP SR packets 
Originally committed as revision 10468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-10 06:58:19 +00:00
Luca Abeni
98561024ac Move the RTP packetization code for MPEG12 video in its own file (rtp_mpv.c) 
Originally committed as revision 10201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-24 07:13:34 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO). 
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:23:32 +00:00
Ronald S. Bultje
80fb82346e Use AV_RB* macros where appropriate. 
patch by Ronald S. Bultje, rsbultje gmail com
thread: Re: [FFmpeg-devel] remove int readers
date: Sat, 23 Jun 2007 09:32:12 -0400

Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 09:32:34 +00:00
Vitor Sessak
7cf0999529 remove empty write trailer functions 
patch by Vitor: [vitor1001 gmail com]

Originally committed as revision 9442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-27 06:54:47 +00:00
Ronald S. Bultje
48961970f1 remove decode_be32/64 and replace them by AV_RB32/64 
patch by Ronald S. Bultje: \ rbultje at ronald bitfreak net /

Originally committed as revision 9299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-13 08:24:22 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Stefan Huehner
2b100ab2bf changes some function declarations from () to (void) as per ansi c. 
Patch by Stefan Huehner % stefan A huehner P org %

Originally committed as revision 8625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-04 11:51:08 +00:00
Panagiotis Issaris
7874024062 Move rtp_check_and_send_back_rr()'s unaltered comments to the header file. 
Originally committed as revision 8234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-04 23:29:14 +00:00
Panagiotis Issaris
1dd7345abc Move rtp_get_payload_type()'s unaltered comments to the header file. 
Originally committed as revision 8233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-04 23:27:59 +00:00
Ramiro Polla
42572ef53f move networking #includes into separate file 
patch by Ramiro Polla angustia =a= arrozcru =d= no-ip =d= org

Originally committed as revision 7817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-04 17:05:44 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00