FFmpeg git repo
Go to file
Michael Niedermayer c7b9eab2be Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time
  rtmp: Set the client buffer time to 3s instead of 0.26s
  rtmp: Handle server bandwidth packets
  rtmp: Display a verbose message when an unknown packet type is received
  lavfi/audio: use av_samples_copy() instead of custom code.
  configure: add all filters hardcoded into avconv to avconv_deps
  avfiltergraph: remove a redundant call to avfilter_get_by_name().
  lavfi: allow building without swscale.
  build: Do not delete tests/vsynth2 directory, which is no longer created.
  lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs
  lavfi: make AVFilterPad opaque after two major bumps.
  lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name().
  lavfi: make avfilter_get_video_buffer() private on next bump.
  jack: update to new latency range API as the old one has been deprecated
  rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r
  ppc: Rename H.264 optimization template file for consistency.
  lavfi: add channelsplit audio filter.
  golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
  sws: fix planar RGB input conversions for 9/10/16 bpp.

Conflicts:
	Changelog
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/golomb.h
	libavcodec/v210dec.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
	libavfilter/formats.c
	libavfilter/version.h
	libavfilter/vf_frei0r.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/video.h
	libavfilter/vsrc_color.c
	libavformat/rtmpproto.c
	libswscale/input.c
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-13 22:43:57 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil arm/intmath: disable av_clip_uintp2_arm with config_small 2012-06-12 23:05:47 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr: fix 10l use of uninitialized data 2012-06-13 13:43:42 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
tools tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20:02 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: update versions 2012-05-24 21:15:01 +02:00
Makefile Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
README
RELEASE
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
cmdutils.c cmdutils: dont return void from a void function 2012-06-10 02:38:01 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
ffplay.c ffplay: fix return value of get_video_frame if avcodec_decode_video fails 2012-06-09 19:45:10 +02:00
ffprobe.c ffprobe: show packet duration in frame 2012-06-06 23:26:04 +02:00
ffserver.c
library.mak
version.sh

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.