Commit Graph

14 Commits

Author SHA1 Message Date
Michael Niedermayer 7fad19a63d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
	doc/developer.texi
	doc/eval.texi
	doc/filters.texi
	doc/protocols.texi
	ffmpeg.c
	ffplay.c
	libavcodec/mpegvideo.h
	libavcodec/x86/cabac.h
	libavfilter/Makefile
	libavformat/avformat.h
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/gxfenc.c
	libavformat/img2.c
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/rtpenc_h264.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 01:25:37 +01:00
Luca Abeni e0a3c287b4 rtpenc: Add support for mp4 format h264
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-11 01:37:26 +02:00
Martin Storsjö 4dbac18e2e rtpenc: Simplify code by introducing a separate end pointer
Also remove redundant parentheses.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-12-11 01:37:26 +02:00
Reimar Döffinger 7f2228dbfe Make buffer size check consistent and avoid a possible overflow. 2011-06-15 20:21:33 +02:00
Reimar Döffinger c940c31c88 Fix spelling. 2011-06-15 20:20:47 +02:00
Luca Abeni e7c7b2d878 Full support for sending H.264 in RTP
This implements support for the "MP4" syntax of H.264 bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-15 17:59:03 +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
Diego Biurrun ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Yao Peter eb853afb8a Fix the M bit for multi-packet NALs.
Patch by Yao Peter (peter AT yuvad DOT com)

Originally committed as revision 18858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 17:11:47 +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
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +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
Reimar Döffinger a56dcc5793 Add some const, fixes warnings:
rtpenc_h264.c:69: warning: assignment discards qualifiers from pointer target type
rtpenc_h264.c:74: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 12152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:07:48 +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