FFmpeg git repo
Go to file
Michael Niedermayer 7b376b398a Merge remote branch 'qatar/master'
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24 03:41:22 +02:00
doc Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
libavfilter mp: remove unused variable outlink in end_frame 2011-04-21 18:46:03 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
libavutil Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
libpostproc libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
libswscale Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
tools Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
.gitignore
Changelog Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02: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 branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffplay.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffprobe.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
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.