1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-04 19:48:19 +00:00
FFmpeg git repo
Go to file
Michael Niedermayer 29582df797 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vble: remove vble_error_close
  VBLE Decoder
  tta: use an integer instead of a pointer to iterate output samples
  shorten: do not modify samples pointer when interleaving
  mpc7: only support stereo input.
  dpcm: do not try to decode empty packets
  dpcm: remove unneeded buf_size==0 check.
  twinvq: add SSE/AVX optimized sum/difference stereo interleaving
  vqf/twinvq: pass vqf COMM chunk info in extradata
  vqf: do not set bits_per_coded_sample for TwinVQ.
  twinvq: check for allocation failure in init_mdct_win()
  swscale: add padding to conversion buffer.
  rtpdec: Simplify finalize_packet
  http: Handle proxy authentication
  http: Print an error message for Authorization Required, too
  AVOptions: don't return an invalid option when option list is empty
  AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)

Conflicts:
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavcodec/vble.c
	libavcodec/version.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 02:50:25 +01:00
doc VBLE Decoder 2011-11-12 01:21:01 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
libavdevice
libavfilter mandelbrot: add a end_scale and pts so we can zoom in. 2011-11-12 00:04:16 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +01:00
libpostproc
libswresample
libswscale swscale: add padding to conversion buffer. 2011-11-11 07:44:35 -08: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-11 02:50:35 +01:00
Changelog VBLE Decoder 2011-11-12 01:21:01 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: use av_noreturn 2011-11-11 04:24:25 +01:00
ffplay.c ffplay: use av_noreturn 2011-11-11 04:25:35 +01:00
ffprobe.c ffprobe: use av_noreturn 2011-11-11 04:26:07 +01:00
ffserver.c ffserver: use av_noreturn 2011-11-11 04:25:53 +01:00
INSTALL
LICENSE
MAINTAINERS VBLE Decoder 2011-11-12 01:21:01 +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.