FFmpeg git repo
Go to file
Michael Niedermayer 2cb4d51654 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  v410dec: Implement explode mode support
  zerocodec: fix direct rendering.
  wav: init st to NULL to avoid a false-positive warning.
  wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
  h264: refactor NAL decode loop
  RTMPTE protocol support
  RTMPE protocol support
  rtmp: Add ff_rtmp_calc_digest_pos()
  rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
  swscale: add missing HAVE_INLINE_ASM check.
  lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
  vc1: Add a test for interlaced field pictures
  swscale: Mark all init functions as av_cold
  swscale: x86: Drop pointless _mmx suffix from filenames
  lavf: use conditional notation for default codec in muxer declarations.
  swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
  dsputil: ppc: cosmetics: pretty-print
  dsputil: x86: add SHUFFLE_MASK_W macro
  configure: respect CC_O setting in check_cc

Conflicts:
	Changelog
	configure
	libavcodec/v410dec.c
	libavcodec/zerocodec.c
	libavformat/asfenc.c
	libavformat/version.h
	libswscale/utils.c
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-23 21:25:09 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
libavdevice lavd/caca: create display *after* checking dither options 2012-07-22 10:32:21 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
libpostproc pp: check that the argument is not NULL as this is not supported 2012-07-07 19:14:21 +02:00
libswresample swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
tools tools/bisect: rename to tools/bisect-create 2012-07-07 14:51:51 +02:00
.gitignore tools/bisect: rename temporary file and add it to git ignore 2012-07-07 13:15:01 +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
Changelog Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
Doxyfile
INSTALL
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
Makefile build: Drop gcc-specific warning flag from header compilation rule 2012-07-22 12:36:30 +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
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
cmdutils.c cmdutils/alloc_buffer: fix typo 2012-07-20 16:42:29 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
ffmpeg.c ffmpeg: select input file based on output time. 2012-07-23 10:59:41 +02:00
ffplay.c ffplay: fix warning that i just mistakenly introduced 2012-07-20 03:47:11 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-07-19 22:01:31 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
version.sh

README

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.