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 13b7781ec8 Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  x86inc: use sse versions of common macros instead of sse2 when applicable
  doc/APIchanges: add missing dates and hashes
  lavf: don't return from void av_update_cur_dts()
  Changelog: add more entries.
  Changelog: update ffmpeg/avconv incompatibility list.
  avconv: remove some redundant temporary variables.
  avconv: fix broken indentation
  avconv: move copy_initial_nonkeyframes to the options context.
  avconv: use file:stream instead of file.stream in log messages.
  doc/avconv: elaborate on basic functionality.
  doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
  openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
  Call avformat_network_init/deinit in the programs
  Remove leftover includes of strings.h
  avutil: Don't allow using strcasecmp/strncasecmp
  Replace all usage of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of toupper/tolower
  cosmetics: insert some spaces in explicit enum value assignments
  move 8SVX audio codecs to the audio codec list part on the next bump
  ...

Conflicts:
	avprobe.c
	doc/APIchanges
	ffplay.c
	ffserver.c
	libavcodec/avcodec.h
	libavdevice/bktr.c
	libavdevice/v4l.c
	libavdevice/v4l2.c
	libavformat/matroskaenc.c
	libavformat/wtv.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/avutil.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 03:01:43 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
libavfilter src_movie: set the channel layout to default if the codec did not set it. 2011-11-06 01:19:56 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +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-07 03:01:43 +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 fate: fix mapchan 2011-11-06 03:01:01 +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-07 03:01:43 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +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 Merge remote-tracking branch 'qatar/master' 2011-11-06 02:23:34 +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 Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +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 HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X. 2011-11-02 15:47:27 +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: 0.8.5 has been released 2011-10-03 23:32:22 +02: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.