Go to file
Michael Niedermayer 15c6be8c7d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  tiertexseq: set correct block_align for audio
  tiertexseq: set audio stream start time to 0
  voc/avs: Do not change the sample rate mid-stream.
  segafilm: use the sample rate as the time base for audio streams
  ea: fix audio pts
  psx-str: fix audio pts
  vqf: set packet duration
  tta demuxer: set packet duration
  mpegaudio_parser: do not ignore information from the first parsed frame
  mpegaudio_parser: be less picky about the start position
  thp: set audio packet durations
  avcodec: add a Vorbis parser to get packet duration
  vorbisdec: read the previous window flag for long windows
  lavc: free the output packet when encoding failed or produced no output.
  lavc: preserve avpkt->destruct in ff_alloc_packet().
  lavc: clarify the meaning of AVCodecContext.frame_number.
  mpegts: Pad the packet buffer in handle_packet().
  mpegts: Do not call read_sl_header() when no bytes remain in the buffer.

Conflicts:
	libavcodec/mpegaudio_parser.c
	libavcodec/version.h
	libavformat/mpegts.c
	tests/ref/fate/pva-demux

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-04 04:26:04 +01:00
doc bluray protocol 2012-03-03 04:30:49 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
libavdevice timefilter: better selftest code. 2012-03-02 16:00:21 +01:00
libavfilter vsrc_testsrc: free option values. 2012-03-03 13:17:39 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
libavutil Remove duplicate initializers for VDA_VLD and GBR24P. 2012-03-03 00:46:40 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample Exit ffmpeg if swr_convert() fails. 2012-02-27 19:02:28 +01:00
libswscale Support RGBA64 as input colour space. 2012-03-04 00:43:18 +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 Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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
Changelog bluray protocol 2012-03-03 04:30:49 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS MAINTAINERS: add 0.10 to the releases, seems ive forgotten it. 2012-03-03 18:35:46 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-04 02:34:14 +01:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
cmdutils.c cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure bluray protocol 2012-03-03 04:30:49 +01:00
ffmpeg.c ffm options should also set discard automatically. 2012-03-04 00:20:10 +01:00
ffplay.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.