1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 81ff0c24ef Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  configure: fix libcdio check
  rtsp: Allow setting the reordering buffer size via an AVOption
  rtsp: Vertically align a constant definition
  rtp: Update the check for distinguishing between RTP and RTCP
  aac: fix build with hardcoded tables
  fate: dependencies for screen codec tests
  riff: Move functions around to be covered by appropriate #ifdefs

Conflicts:
	configure
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 13:58:14 +02:00
compat
doc examples/muxing: merge add_audio_stream() and add_video_stream() 2012-10-17 21:39:13 +02:00
libavcodec Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 2012-10-19 13:58:14 +02:00
libavdevice
libavfilter lavfi/avf_concat: fix invalid exclusive test. 2012-10-17 21:28:58 +02:00
libavformat Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 2012-10-19 13:58:14 +02:00
libavresample
libavutil Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72' 2012-10-19 13:29:24 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 2012-10-19 13:58:14 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95' 2012-10-19 13:47:47 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: add missing check for ftell() return 2012-10-18 00:10:59 +02:00
cmdutils.h
common.mak
configure Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2' 2012-10-19 13:58:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
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.