1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 259a960f1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vp6: Fix illegal read.
  avfilter: Don't copy garbage from the stack when setting up video pictures.
  avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
  avcodec: Remove a misplaced and useless attribute_deprecated
  avconv: add -dump_attachment option.
  avconv: add -attach option.
  avconv: make negative mappings disable only streams from the specified file
  fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64

Conflicts:
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 01:44:06 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
libavdevice Replace all strcasecmp/strncasecmp usages. 2011-11-03 19:25:26 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
libavformat lavf: fix null pointer dereference in rdt 2011-11-03 22:38:10 +01:00
libavutil Replace all strcasecmp/strncasecmp usages. 2011-11-03 19:25:26 +01:00
libpostproc
libswresample
libswscale sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used. 2011-10-31 01:53:37 +01:00
mt-work
presets
tests Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
tools
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-03 02:16:26 +01:00
cmdutils_common_opts.h
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
configure HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-11-04 01:44:06 +01:00
ffplay.c Revert "Remove detection of mmsh protocol in ffplay." 2011-10-31 18:04:39 +01:00
ffprobe.c
ffserver.c
INSTALL
LICENSE
MAINTAINERS HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +01:00
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.