FFmpeg git repo
Go to file
Michael Niedermayer 27ef7b1bcd Merge remote-tracking branch 'newdev/master'
* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-26 03:06:30 +01:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-26 03:06:30 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-26 03:06:30 +01:00
libavdevice Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavfilter Update to latest MPlayer version. 2011-03-25 19:05:02 +01:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-26 03:06:30 +01:00
libavutil Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-25 02:51:20 +01:00
tests Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore
Changelog
cmdutils_common_opts.h
cmdutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cmdutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.mak
configure Merge remote-tracking branch 'newdev/master' 2011-03-26 03:06:30 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Merge remote-tracking branch 'newdev/master' 2011-03-26 03:06:30 +01:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-03-21 16:45:21 +01:00
ffserver.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS
Makefile Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.