1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 5f268ca5c5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: pass options from AVFormatContext to avio.
  avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
  avio: add avio_open2, taking an interrupt callback and options
  avio: add support for passing options to protocols.
  avio: add and use ffurl_protocol_next().
  avformat: Pass the interrupt callback on to chained muxers/demuxers
  avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
  avformat: Use ff_check_interrupt
  avio: Add an internal utility function for checking the new interrupt callback
  avio: Add AVIOInterruptCB
  texi2html: remove stray \n
  doc: prettyfy the texi2html documentation
  swscale: handle unaligned buffers in yuv2plane1

Conflicts:
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 00:33:39 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec lavc: add supports of OS/2 threads 2011-11-13 17:33:09 +01:00
libavdevice Force opaque alpha channel for 32bit x11grab image. 2011-11-13 02:02:06 +01:00
libavfilter vsrc_mandelbrot: set options through the opt framework 2011-11-13 21:31:23 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-12 02:50:25 +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 Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
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: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
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 Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure lavc: add supports of OS/2 threads 2011-11-13 17:33:09 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
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 Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINER: add libavfilter section and add myself to yadif & mandelbrot 2011-11-13 19:33:34 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: bump to 0.8.6.git after the release 2011-11-12 21:00:13 +01:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.