1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 7ae473e8a0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  nuv: K&R formatting cosmetics
  build: generalise rules and variable settings for av* programs
  nuv: check RTjpeg header for validity
  Revert "nuv: check per-frame header for validity."
  imc: remove unused field IMCContext.one_div_log2
  imc: fix size of a memset()
  imc: remove empty if() block
  fate: simplify variable setting filter.mak
  lavf: Declare an AVRational struct without a struct literal

Conflicts:
	Makefile
	configure
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 22:22:37 +02:00
compat
doc libtwolame MP2 encoding support 2012-08-05 17:06:59 +00:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-06 22:22:37 +02:00
libavdevice Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
libavfilter Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-06 22:22:37 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-08-06 22:22:37 +02:00
tools
.gitignore
arch.mak
Changelog libtwolame MP2 encoding support 2012-08-05 17:06:59 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-08-06 22:22:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg.c Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
ffplay.c
ffprobe.c ffprobe: refactor frames decoding. 2012-08-06 17:37:59 +02:00
ffserver.c
INSTALL
library.mak
LICENSE LICENSE: Document all GPL files 2012-08-04 04:03:08 +02:00
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-06 22:22:37 +02:00
README
RELEASE
version.sh

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.