1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer afc0a24d7d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: add support for planar signed 8-bit PCM.
  ra144enc: add sample_fmts list to ff_ra_144_encoder
  smackaud: use uint8_t* for 8-bit output buffer type
  smackaud: clip output samples
  smackaud: use sign_extend() for difference value instead of casting
  sipr: use a function pointer to select the decode_frame function
  sipr: set mode based on block_align instead of bit_rate
  sipr: do not needlessly set *data_size to 0 when returning an error
  ra288: fix formatting of LOCAL_ALIGNED_16
  udp: Allow specifying the local IP address
  VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
  vc1dec: move an if() block.
  vc1dec: use correct hybrid prediction threshold.
  vc1dec: Partial rewrite of vc1_pred_mv()
  vc1dec: take ME precision into account while scaling MV predictors.
  lavf: don't leak corrupted packets

Conflicts:
	libavcodec/8svx.c
	libavcodec/ra288.c
	libavcodec/version.h
	libavformat/iff.c
	libavformat/udp.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 03:45:23 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-10 03:45:23 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-10 03:45:23 +01:00
libavdevice v4l2: fix uninitialized variable 2011-11-08 01:20:35 +01:00
libavfilter vf_fade: reindent after previous commit 2011-11-10 01:31:28 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-10 03:45:23 +01:00
libavutil audioconvert: make av_get_channel_layout accept composite names. 2011-11-09 21:03:47 +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 Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
mt-work
presets
tests Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
tools
.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.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 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 Revert commit 0bc391281a 2011-11-09 19:12:51 +01:00
ffplay.c Merge remote-tracking branch 'cus/stable' 2011-11-09 20:51:49 +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
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.