1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 2f9e97b32a Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
  hls: Set stream offset before opening a chained demuxer

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 14:11:21 +02:00
compat
doc ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
libavcodec Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f' 2013-07-29 12:09:38 +02:00
libavdevice
libavfilter Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libavformat Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622' 2013-07-29 14:11:21 +02:00
libavresample
libavutil Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libpostproc
libswresample
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
tests ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
tools
.gitignore
arch.mak
Changelog ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a' 2013-07-27 09:13:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
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.