FFmpeg git repo
Go to file
Michael Niedermayer 7c29313b38 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  APIchanges: fill in revision for AVFrame.age deprecation
  avcodec: deprecate AVFrame.age
  4xm: remove unneeded check for remaining unused data.
  lavf: force threads to 1 in avformat_find_stream_info()
  swscale: fix overflows in vertical scaling at top/bottom edges.
  lavf: add OpenMG audio muxer.
  omadec: split data that will be used in the muxer to a separate file.
  lavf: rename oma.c -> omadec.c
  tmv decoder: set correct pix_fmt

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/oma.c
	libavformat/version.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-19 02:34:18 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
libavdevice
libavfilter
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
libavutil
libpostproc
libswresample
libswscale swscale: fix overflows in vertical scaling at top/bottom edges. 2011-12-18 08:27:43 -08:00
mt-work
presets
tests Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking' 2011-12-18 23:11:05 +01:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
avconv.c
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Assume architecture arm for machine hardware name iPad*. 2011-12-18 13:48:44 +01:00
ffmpeg.c
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
ffprobe.c
ffserver.c
library.mak
version.sh

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.