1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 78bfc417d4 Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21 14:40:10 +01:00
compat
doc Document new APIs for av_packet_{un, }pack_dictionary() 2013-11-20 17:03:19 +01:00
libavcodec Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec 2013-11-21 14:40:10 +01:00
libavdevice
libavfilter avfilter/showspectrum: use 0 dummies for range in const. 2013-11-20 16:38:09 +01:00
libavformat avformat/utils: inject audio skip side data before the side data merge code 2013-11-21 03:21:23 +01:00
libavresample
libavutil avutil: reintroduce lls1 as the 52 ABI needs it 2013-11-17 16:44:32 +01:00
libpostproc
libswresample
libswscale swscale/x86: SIMD deinterleaveBytes() depends on YASM 2013-11-19 22:36:27 +01:00
presets
tests avformat/utils: inject audio skip side data before the side data merge code 2013-11-21 03:21:23 +01:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c cmdutils: randomize spaces after 69cf626f9. 2013-11-21 12:52:30 +01:00
cmdutils.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-11-21 12:10:15 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: fix do_streamcopy() so it copies side data too 2013-11-20 00:23:23 +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.