FFmpeg git repo
Go to file
Michael Niedermayer a72580fc9e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/vda.c
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/vda_internal.h
	libavcodec/version.h
	libavformat/options.c
	libavutil/avutil.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 03:13:42 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
libavfilter amovie: avoid crash in amovie_request_frame() if no samplesref is available 2011-11-15 00:10:15 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
libpostproc
libswresample swr: set the default used_ch_count value to zero. 2011-11-14 22:11:28 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
mt-work
presets
tests Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
tools
.gitignore
avconv.c
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
INSTALL
LICENSE
MAINTAINERS MAINTAINER: add libavfilter section and add myself to yadif & mandelbrot 2011-11-13 19:33:34 +01:00
Makefile
README
RELEASE RELEASE: bump to 0.8.6.git after the release 2011-11-12 21:00:13 +01:00
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.