1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 17106a7c90 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
	ffmpeg.c
	libavcodec/audio_frame_queue.c
	libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-26 22:40:02 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
doc examples/decoding_encoding.c: tell where the decoding output files are printed 2012-08-24 17:31:10 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
libavdevice dshow:protect access to curbufsize to promote consistency 2012-08-20 20:58:05 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
libavformat nutenc: Support writing an index 2012-08-26 22:15:21 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
libpostproc rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libswscale rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles. 2012-08-25 13:15:41 -07:00
cmdutils_common_opts.h Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174' 2012-08-20 17:06:50 +02:00
cmdutils.c Fix one of the problems with -codecs, -encoders and -decoders. 2012-08-25 08:49:23 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure huffman/huffyuv: move lorens huffman table generation code to huffman.c/h 2012-08-22 16:52:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c ffmpeg: make decoding_needed a counter. 2012-08-22 19:04:30 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-08-26 02:34:24 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.