FFmpeg git repo
Go to file
Michael Niedermayer 0bd42ae72c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Avoid a warning about mixed declarations and code
  BMV demuxer and decoder
  matroskaenc: Make sure the seekhead struct is freed even on seek failure
  mpeg12enc: Remove write-only variables.
  mpeg12enc: Don't set up run-level info for level 0.
  msmpeg4: Don't set up run-level info for level 0.
  avformat: Warn about using network functions without calling avformat_network_init
  avformat: Revise wording
  rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
  rdt: Check the return value of avformat_open
  rtsp: Discard the dynamic handler, if it has an alloc function which failed
  dsputil: use cpuflags in x86 versions of vector_clip_int32()

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-08 02:03:14 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-08 02:03:14 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-08 02:03:14 +01:00
libavdevice v4l2: fix uninitialized variable 2011-11-08 01:20:35 +01:00
libavfilter src_movie: set the channel layout to default if the codec did not set it. 2011-11-06 01:19:56 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-08 02:03:14 +01:00
libavutil mpegaudiodec: add SSE-optimized imdct36() 2011-11-07 22:35:55 +01:00
libpostproc postproc: remove stray + 2011-10-30 18:11:09 +01:00
libswresample ffmpeg: add -map_channel option. 2011-11-04 19:40:32 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests fate: add --timeout=60 --contimeout=60 to fate-rsync 2011-11-07 15:13:16 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-08 02:03:14 +01:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-11-01 02:02:20 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-11-01 02:02:20 +01:00
common.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffprobe.c ffprobe: refactor value_string() to accept an unit_value struct 2011-11-07 14:53:36 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
INSTALL
LICENSE
MAINTAINERS HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README
RELEASE
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.