ffmpeg/tools
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
..
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
clean-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
cws2fws.c tests/tools/examples: Replace direct exit() calls by return. 2011-12-08 01:00:58 +01:00
enum_options.c tools: add a tool for enumerating/printing AVOptions in texinfo format 2011-10-24 14:18:07 +02:00
graph2dot.c graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
lavfi-showfiltfmts.c lavfi-showfiltfmts.c: fix handling of null names 2011-11-26 18:12:25 +01:00
patcheck Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
probetest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
qt-faststart.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
trasher.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
unwrap-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00