virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
30,792 Commits 37 Branches 400 Tags 460 MiB
dbf23d191a
Commit Graph

49 Commits

Author SHA1 Message Date
Michael Niedermayer
45fb647495 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/h264dsp_template.c
	libavcodec/mpeg12.c
	libavformat/aacdec.c
	libavformat/avidec.c
	libavformat/internal.h
	libavformat/movenc.c
	libavformat/rtpenc.c
	libavformat/rtpenc_latm.c
	libavformat/sdp.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/pixfmt.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-11 03:51:36 +02:00
Martin Storsjö
635fac9af1 rtpenc: Declare the rtp flags private AVOptions in rtpenc.h 
This allows other muxers that chain a RTP muxer to declare
the same options easily.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:50:08 +03:00
Juan Carlos Rodriguez
0832122880 rtpenc: MP4A-LATM payload support 
This is enabled with an AVOption on the RTP muxer. The SDP
generator looks for a latm flag in the rtpflags field.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-10 10:49:20 +03:00
Juan Carlos Rodriguez
ef409645f0 rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +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
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
e8bb2e2439 avio: deprecate url_fget_max_packet_size 
AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -05: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ò
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
Martin Storsjö
35b0169484 RTP/VP8: Update the warning about the VP8 payload 
The current implementation is incompatible with the latest spec drafts,
this should be communicated clearly to the user.

Originally committed as revision 25887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 11:45:57 +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
Josh Allmann
7f3468d392 rtp: Replace hardcoded RTCP packet types with defines 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 09:15:31 +00:00
Josh Allmann
7b18d94cb3 Add RTP packetization of VP8 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-16 14:21:17 +00:00
Josh Allmann
91af5601c1 Add RTP packetization of Theora and Vorbis 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 11:16:07 +00:00
Måns Rullgård
81f460a373 rtpenc: remove unnecessary #include unistd.h 
Originally committed as revision 24071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-06 11:42:48 +00:00
Luca Abeni
8a2679ada4 Simplify (no need to check for st->codec->extradata) and correct 
(extradata_size must be at least 5 bytes) the H.264 MP4 syntax check
in rtpenc.c

Originally committed as revision 23638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-17 10:30:52 +00:00
Luca Abeni
8b889b3480 If the video stream is H.264 with MP4 syntax, store the NAL lenght size in 
the RTP muxer context (it will be used later for splitting frames in NALs)

Originally committed as revision 23625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-16 12:59:47 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header 
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 08:53:40 +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
Martin Storsjö
4c1202f76e Initialize ssrc and base_timestamp using ff_random_get_seed() 
Originally committed as revision 22706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 08:48:45 +00:00
Martin Storsjö
b1d55e5e4f Use AVFormatContext.start_time_realtime in the RTP muxer 
Originally committed as revision 22543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 10:37:12 +00:00
Martin Storsjö
594a9aebbe Make the ntp_time function available to other parts of libavformat, as ff_ntp_time 
Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-10 22:21:39 +00:00
Timo Teräs
4e8052ddad Fix syncronisation for streams with a high encoding delay. 
Patch by Timo Teräs (timo DOT teras AT iki DOT fi)

Originally committed as revision 21743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 19:33:08 +00:00
Luca Abeni
3f60d2d327 Remove the inclusion of unneeded headers 
Originally committed as revision 21193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 18:18:21 +00:00
Luca Abeni
759dc2b6cc Remove outdated comments. 
Originally committed as revision 20983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 17:12:29 +00:00
Luca Abeni
d3d1eae659 Remove a useless local variable. 
Originally committed as revision 20946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:41:09 +00:00
Luca Abeni
cd7bfe4079 Remove outdated comment 
Originally committed as revision 20945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:38:21 +00:00
Luca Abeni
b3fbe02c86 Remove an unneeded local variable. 
Originally committed as revision 20944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 13:19:54 +00:00
Luca Abeni
6399c17d54 Use different dynamic payload types for audio and video. 
Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 21:31:10 +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
Martin Storsjö
08e696c0b2 Add support for AMR audio in the RTP muxer 
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-08 07:16:14 +00:00
Martin Storsjö
9edfaf3c6c Add support for H.263 video in the RTP muxer 
patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 06:41:55 +00:00
Luca Abeni
0766c3ee98 Make rtp_write_header() fail in case of unsupported payload type 
Originally committed as revision 18204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 21:36:44 +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
d3536678dc Do not use RTP_MAX_PACKET_LENGTH in the RTP muxer 
Originally committed as revision 17022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 20:41:15 +00:00
Luca Abeni
17a5894a23 Merge rtp_aac.h and rtp_mpv.h in rtpenc.h 
Originally committed as revision 17020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 15:30:41 +00:00
Luca Abeni
302879cb36 Split rtp.h in rtp.h, rtpdec.h, and rtpenc.h 
Originally committed as revision 17016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 10:35:52 +00:00
Luca Abeni
21da81d784 Introduce a new num_frames field in RTPDemuxContext so that rtp_aac.c 
does not need to abuse read_buf_index

Originally committed as revision 17004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 14:53:25 +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
Måns Rullgård
e8420626d0 RTP: use dprintf(), allow compilation with -DDEBUG 
Originally committed as revision 14211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 19:41:10 +00:00
Luca Abeni
f6f848397a Remove outdated comment 
Originally committed as revision 14107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 08:22:16 +00:00
Luca Abeni
a4696aa2fe Remove improper usage of AV_TIME_BASE_Q 
Originally committed as revision 13960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 11:55:57 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +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
d597e1b76c Fix computation of the "NTP time" field in RTCP SR packets, and do not 
export times with microsecond precision

Originally committed as revision 12158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-20 10:19:35 +00:00
Luca Abeni
f79bfe481d Add support for H.264 video in the RTP muxer 
Originally committed as revision 11589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-21 14:01:57 +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