1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer a81a2b514e Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 06:05:19 +01:00
compat
doc Phantom Cine demuxer (iteration 2014.3) 2014-03-16 18:24:30 +01:00
libavcodec Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27' 2014-03-17 06:05:19 +01:00
libavdevice
libavfilter avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2) 2014-03-16 17:25:54 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2014-03-16 22:38:05 +01:00
libavresample
libavutil
libpostproc
libswresample
libswscale Add missing external declarations. 2014-03-17 00:48:09 +01:00
presets
tests avformat/movenc: only ommit encoder tag of the metadata for bitexact mode 2014-03-16 16:26:35 +01:00
tools
.gitignore
arch.mak
Changelog Changelog: move post 2.2 branching entries out of the 2.2 changelog 2014-03-16 19:15:58 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: factorize mips arch extensions out 2014-03-14 19:49:02 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix printing INT64_MIN pts at the end 2014-03-16 06:26:40 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
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.