Go to file
Michael Niedermayer 686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
libavfilter vf_mp: do not add duplicated pixel formats. 2011-06-22 19:05:00 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02: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-22 05:16:40 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-06-21 03:38:25 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c cmdutils: remove outcommented merge trash 2011-06-20 13:22:23 +02:00
cmdutils.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
common.mak build: move basic rules and variables to main Makefile 2011-06-23 12:17:08 +01:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
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 Fix zero-length gnu_printf format string warning. 2011-06-21 21:41:28 +02:00
ffplay.c ffplay: use new avformat_open_* API. 2011-06-22 20:08:45 +02:00
ffprobe.c ffprobe: remove duplicate avformat_alloc_context() 2011-06-21 14:38:58 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Use the contents of RELEASE as version fallback instead of 'UNKNOWN' 2011-06-19 19:54:07 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.