FFmpeg git repo
Go to file
Michael Niedermayer 06219db935 Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c

See: bf2ce19e51
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 21:16:33 +01:00
compat Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA' 2014-03-06 20:44:33 +01:00
doc lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
libavcodec Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e' 2014-03-09 21:16:33 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
libavformat Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c' 2014-03-09 01:50:17 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2014-03-09 15:37:35 +01:00
libpostproc
libswresample
libswscale
presets
tests mxf: Set audio packets pts 2014-03-06 19:28:20 +01:00
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore
arch.mak
Changelog lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'c708b5403346255ea5adc776645616cc7c61f078' 2014-03-09 14:30:24 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
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.