FFmpeg git repo
Go to file
Michael Niedermayer 434f248723 Merge remote branch 'qatar/master'
* qatar/master: (22 commits)
  ac3enc: move extract_exponents inner loop to ac3dsp
  avio: deprecate url_get_filename().
  avio: deprecate url_max_packet_size().
  avio: make url_get_file_handle() internal.
  avio: make url_filesize() internal.
  avio: make url_close() internal.
  avio: make url_seek() internal.
  avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
  avio: make url_write() internal.
  avio: make url_read_complete() internal.
  avio: make url_read() internal.
  avio: make url_open() internal.
  avio: make url_connect internal.
  avio: make url_alloc internal.
  applehttp: Merge two for loops
  applehttp: Restructure the demuxer to use a custom AVIOContext
  applehttp: Move finished and target_duration to the variant struct
  aacenc: reduce the number of loop index variables
  avio: deprecate url_open_protocol
  avio: deprecate url_poll and URLPollEntry
  ...

Conflicts:
	libavformat/applehttp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-05 02:31:56 +02:00
doc Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
ffpresets
libavcodec Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
libavdevice
libavfilter Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
libavutil
libpostproc
libswscale Fix yuvj420p scaling artefact, issue1108. 2011-04-03 16:40:11 +02:00
mt-work
tests Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
tools
.gitignore
Changelog add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: make 'bits_per_raw_sample' option more useful 2011-04-04 00:35:58 +02:00
ffplay.c
ffprobe.c
ffserver.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
ffserver.h
INSTALL
LICENSE
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile
README
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.