Go to file
Michael Niedermayer f67309cabe Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegtsenc: Support LATM packetization for AAC
  adtsenc: Don't expose the muxer internals to the rest of lavf
  mpegtsenc: use AVFormatContext for AAC packetization
  mpegtsenc: use AVERROR() for return codes

Conflicts:
	libavformat/adts.h
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-03 02:56:52 +02:00
doc ffprobe: add flat output format. 2012-06-01 21:06:06 +02:00
libavcodec aacsbr: remove unused variables 2012-06-03 01:53:36 +02:00
libavdevice
libavfilter Merge remote-tracking branch 'qatar/master' 2012-05-31 21:27:42 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-03 02:56:52 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil log: add category to AVClass 2012-06-01 14:02:03 +02:00
libpostproc
libswresample swr: fix a few typo. 2012-06-01 08:06:36 +02:00
libswscale
mt-work
presets
tests fate: enable fate-mapchan-6ch-extract-2-downmix-mono 2012-06-01 18:44:07 +02:00
tools probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
.gitignore
arch.mak
Changelog Changelog: apply misc formatting fixes 2012-05-29 13:06:38 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: replace 1 line #ifs by if() 2012-05-30 15:45:05 +02:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-06-03 02:56:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: move pan filter insertion up. 2012-06-01 18:43:13 +02:00
ffplay.c ffplay: remove VideoPicture pix_fmt and use frame pixel format instead 2012-05-29 22:41:50 +02:00
ffprobe.c ffprobe: add flat output format. 2012-06-01 21:06: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.