1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 4640da7e58 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sgidec: Use bytestream2 functions to prevent buffer overreads.
  cosmetics: Move static and inline attributes to more standard places.
  configure: provide libavfilter/version.h header to get_version()
  swscale: change yuv2yuvX code to use cpuflag().
  libx264: Don't leave max_b_frames as -1 if the user didn't set it
  FATE: convert output to rgba for the targa tests which currently output pal8
  fate: add missing reference files for targa tests in 9c2f9b0e2
  FATE: enable the 2 remaining targa conformance suite tests
  targa: add support for rgb555 palette
  FATE: fix targa tests on big-endian systems

Conflicts:
	libavcodec/sgidec.c
	libavcodec/targa.c
	libswscale/x86/output.asm
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-15 01:16:54 +01:00
doc doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter 2012-01-14 12:36:41 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
libavdevice Revert "v4l2: poll the file descriptor" 2012-01-11 14:57:56 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
libavformat mpeg12dec: BW10 support 2012-01-14 19:25:15 +01:00
libavutil Fix step_minus1 pixel descirption for RGB64. 2012-01-11 10:54:12 +01:00
libpostproc
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils.h
common.mak
configure configure: provide libavfilter/version.h header to get_version() 2012-01-14 07:44:43 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
ffmpeg.c Increase maximum encoding video buffer size. 2012-01-14 00:59:02 +01:00
ffplay.c ffplay: silence buffer size must be a multiple of frame size 2012-01-11 23:10:45 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.