FFmpeg git repo
Go to file
Michael Niedermayer 4e04e1b81e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: convert yuv2yuvX() to using named arguments.
  swscale: rename "dstw" to "w" to prevent name collisions.
  swscale: use named registers in yuv2yuv1_plane() place.
  lavf: fix aspect ratio mismatch message.
  avconv: set AVFormatContext.duration from '-t'
  cljr: implement encode2.
  cljr: set the properties of the coded_frame, not input frame.
  dnxhdenc: switch to encode2.
  bmpenc: switch to encode2().

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/cljr.c
	libavformat/utils.c
	tests/ref/vsynth1/cljr
	tests/ref/vsynth2/cljr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-13 02:06:44 +01:00
doc
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-13 02:06:44 +01:00
libavdevice
libavfilter
libavformat Fix aspect ratio mismatch message 2012-02-12 20:24:29 +01:00
libavutil Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-02-13 02:06:44 +01:00
mt-work
presets
tests cljr: set the properties of the coded_frame, not input frame. 2012-02-12 08:05:38 +01:00
tools
.gitignore
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-02-13 02:06:44 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.