1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
doc Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +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-27 03:51:04 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
libavfilter Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
libavutil Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
libpostproc libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
libswscale Fix runtime CPU detection in libswscale. 2011-04-27 01:52:36 +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-27 03:51:04 +02:00
tools Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
.gitignore Remove stray libavcore and _g binary references. 2011-04-23 14:23:20 +02:00
Changelog Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote branch 'qatar/master' 2011-04-26 04:21:15 +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 Remove now unused audio_float configure option. 2011-04-25 16:51:27 +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-27 03:51:04 +02:00
ffplay.c ffplay: fix logic for selecting the show mode in case of missing video 2011-04-25 22:45:17 +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-27 03:51:04 +02:00
ffserver.h
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.