FFmpeg git repo
Go to file
Michael Niedermayer 6d91045d83 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  doc: update libavfilter documentation
  tls: Use the URLContext as logging context
  aes: Avoid illegal read and don't generate more key than we use.
  mpc7: Fix memset call in mpc7_decode_frame function
  atrac1: use correct context for av_log()
  apedec: consume the whole packet when copying to the decoder buffer.
  apedec: do not needlessly copy s->samples to nblocks.
  apedec: check output buffer size after calculating actual output size
  apedec: remove unneeded entropy decoder normalization.
  truespeech: use memmove() in truespeech_update_filters()
  vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
  vorbisdec: remove unneeded buf_size==0 check
  vorbisdec: return proper error codes instead of made-up ones
  http: Don't add a Range: bytes=0- header for POST
  sunrast: Check for invalid/corrupted bitstream
  http: Change the chunksize AVOption into chunked_post
  http: Add encoding/decoding flags to the AVOptions
  avconv: remove some codec-specific hacks
  crypto: add decoding flag to options.
  tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
  ...

Conflicts:
	doc/libavfilter.texi
	libavcodec/atrac1.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 02:50:35 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +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-11 02:50:35 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
libpostproc
libswresample
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-11 02:50:35 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-08 02:03:14 +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 Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
ffplay.c Merge remote-tracking branch 'cus/stable' 2011-11-09 20:51:49 +01:00
ffprobe.c
ffserver.c
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.