Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
Go to file
Michael Niedermayer cac9877ed5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
  include stdint.h in adpcm_data.h
  mpeg12: reorder functions to avoid ugly forward declarations
  Fixed off by one packet size allocation in the smacker demuxer.
  Check for invalid packet size in the smacker demuxer.
  ape demuxer: fix segfault on memory allocation failure.
  xan: Add some buffer checks
  xan: Remove extra trailing newline
  Fixed size given to init_get_bits() in xan decoder.

Conflicts:
	libavcodec/mpeg12.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-13 23:44:12 +02:00
doc ffprobe: add JSON output printing format. 2011-09-13 23:03:05 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-13 23:44:12 +02:00
libavdevice dshow: indent 2011-09-12 19:22:13 +02:00
libavfilter vf_remove_logo: domt access vf->next->query_format() directly but use the API. 2011-09-13 03:52:30 +02:00
libavformat libavformat/utils: print ts in the "invalid dts/pts combination" case. 2011-09-13 06:42:13 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-13 23:44:12 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137 2011-09-13 17:29:23 +02:00
tools Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
.gitignore gitignore: ignore .exp files, as generated by the MS linker on win32 2011-09-12 18:17:43 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
Changelog ffprobe: add JSON output printing format. 2011-09-13 23:03:05 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure configure: slightly more robust looking check for math functions. 2011-09-13 17:34:19 +02: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: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137 2011-09-13 17:29:23 +02:00
ffplay.c ffplay: remove thread command line option code, it is unneeded for -threads X to work. 2011-09-13 15:05:42 +02:00
ffprobe.c ffprobe: rename print_{int,str}_f callbacks to print_{integer,string}. 2011-09-13 23:06:11 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile build: fix install rule with --progs-suffix. 2011-09-11 01:48:29 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +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.