Go to file
Michael Niedermayer 0460b9bb3e Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 21:38:53 +01:00
compat
doc lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
libavcodec lavc/mpegvideo_enc: fix typo 2013-10-29 18:36:21 +01:00
libavdevice timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
libavfilter Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
libavformat Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04' 2013-10-29 20:47:23 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil avutil/opt: fix flags check on non x86 2013-10-29 21:07:45 +01:00
libpostproc
libswresample
libswscale
presets
tests FATE: add bitexact sws flags to the fieldorder test 2013-10-27 21:34:28 +01:00
tools
.gitignore
arch.mak
Changelog Changelog: add 2.1 2013-10-28 00:39:34 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
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_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
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
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: update which releases i maintain 2013-10-28 00:40:15 +01:00
Makefile
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.