FFmpeg git repo
Go to file
Michael Niedermayer 64a0ed190e Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:14:52 +01:00
compat
doc Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libavcodec Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089' 2013-11-01 15:14:52 +01:00
libavdevice timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
libavfilter avfilter/vf_gradfun: add emms_c() for mmxext 2013-11-01 14:42:06 +01:00
libavformat Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720' 2013-11-01 13:15:21 +01:00
libavresample
libavutil Merge commit '28096e0a806e57376541e6222d315619906e3c55' 2013-11-01 12:59:08 +01:00
libpostproc
libswresample
libswscale Optimize pure C unscaled yuv2rgb. 2013-10-30 20:52:24 +01:00
presets
tests tests/fate: fix fate on branches different from origin/master 2013-10-29 21:53:59 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'e78913052263af80855590659fb0f705e8f13c8a' 2013-10-29 19:50:03 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffmpeg.h Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 2013-10-29 21:38:53 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE
MAINTAINERS MAINTAINERS: add myself as libzvbi-teletextdec maintainer 2013-10-31 21:31:52 +01:00
Makefile build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +01: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.