1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer bd9492174d Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'
* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
	libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-05 01:27:48 +01:00
compat
doc Merge commit 'de203abd71baae7f120313259b45cf935c85203e' 2014-02-04 14:33:33 +01:00
libavcodec Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27' 2014-02-05 01:18:48 +01:00
libavdevice lavd/opengl_enc: fix parentheses in if condition 2014-02-02 22:14:34 +01:00
libavfilter avfilter/dualinput: fix repeatlast to match docs and eof_action=pass 2014-02-04 14:54:14 +01:00
libavformat Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27' 2014-02-05 01:18:48 +01:00
libavresample
libavutil Fix compilation with msvc/icl due to missing header and define. 2014-02-03 19:48:41 +01:00
libpostproc
libswresample
libswscale
presets
tests RoQ encoder: support different integer framerates 2014-02-03 02:04:38 +01:00
tools
.gitignore examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: tweak debug_ts logging and add more of it 2014-02-02 13:11:52 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: use avformat_alloc_context() 2014-02-04 16:01:02 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
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.