1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 46eb300d01 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: remove MULL inline asm
  mathops: use MUL64 macro where it forms part of other ops
  tty: factorise returning error codes.
  rawdec: add framerate private option.
  x11grab: add framerate private option.
  fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
  bktr: don't error when AVFormatParameters.time_base isn't set.
  cmdutils: add missing const qualifier
  Skip headers not designed to work standalone during 'make checkheaders'.
  Add missing #includes to make headers self-contained.
  musepack: remove unnecessary #include from mpcdata.h
  musepack: remove extraneous mpcdata.h inclusions
  Fix error check in av_file_map()

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-05 03:00:31 +02:00
doc lavfi: add avfilter_link_free() function 2011-06-03 00:41:32 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
libavfilter lavfi: add avfilter_link_free() function 2011-06-03 00:41:32 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
libavutil Fix error check in av_file_map() 2011-06-04 17:03:25 +01:00
libpostproc postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-31 03:10:35 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
tools Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c cmdutils: add missing const qualifier 2011-06-04 18:09:01 +01:00
cmdutils.h cmdutils: move "#undef main" from ffplay.c to cmdutils.h 2011-06-03 17:03:43 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
ffplay.c ffplay: error out with invalid sample rate or channels. 2011-06-04 00:16:12 +02:00
ffprobe.c cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.