1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 2f265d9087 Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:36:37 +01:00
compat
doc Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e' 2012-12-14 13:58:12 +01:00
libavcodec Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13' 2012-12-14 15:36:37 +01:00
libavdevice
libavfilter Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602' 2012-12-14 15:17:51 +01:00
libavformat sauce: test filetype correctly for datatype 5 (binary text) 2012-12-14 16:46:29 +11:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-12-12 10:50:21 +01:00
libavutil mem: minor simplification of the alignment hack code 2012-12-14 05:36:22 +01:00
libpostproc doxy: add ref for lavfi, lpp and lsws. 2012-12-11 02:13:43 +01:00
libswresample audioconvert/arm: require alignment of 16 2012-12-14 04:49:09 +01:00
libswscale doxy: add ref for lavfi, lpp and lsws. 2012-12-11 02:13:43 +01:00
presets
tests fate: add BRSTM demuxer test 2012-12-11 11:34:47 +00:00
tools qt-faststart: Check offset_count 2012-12-13 15:07:20 +01:00
.gitignore
arch.mak
Changelog lavfi: add aselect audio variant of select 2012-12-13 00:10:24 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure configure/arm: print if thumb mode is enabled 2012-12-14 02:37:32 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: sub2video: use start and end time. 2012-12-12 15:05:50 +01:00
ffmpeg.h ffmpeg: sub2video: use start and end time. 2012-12-12 15:05:50 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +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.