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 0a23067ab4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
  mpeg124: use sign_extend() function
  ac3dec: use get_sbits() instead of manually sign-extending
  4xm: fix signed overflow
  wmavoice: fix a signed overflow
  mpegvideo_enc: fix a signed overflow
  crc: fix signed overflow
  fate: run avconv with -nostats flag
  avtools: add -v as alias for -loglevel
  avconv: always print stats with AV_LOG_INFO
  doc/avconv: add forgotten output/per-stream info to -filter
  avconv: add -stats option to enable/disable printing encoding progress
  avconv: in output_packet() don't set decoded_data_size for video.
  avconv: remove pointless always true condition
  avconv: factorize common code in transcode_init()
  zmbv: remove memcpy() of decoded frame
  mpeg12enc: use sign_extend() function
  h264pred: use unsigned types for pixel values, fix signed overflows
  h264: fix signed overflows in x*0x01010101 expressions
  h264pred: remove unused variables

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-10 03:50:58 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-06 03:42:14 +02:00
libavfilter deshake: simplify filename check. 2011-10-04 21:36:54 +02:00
libavformat g723.1 muxer 2011-10-10 02:58:18 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample/rematrix: show matrix with debug log level 2011-10-07 13:51:40 +02:00
libswscale sws: gbr24p input support 2011-10-09 02:04:54 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
Changelog Add libmodplug support. 2011-10-04 22:36:33 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure configure: fix compilation without libmodplug 2011-10-05 00:34:14 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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-10-10 03:50:58 +02:00
ffplay.c ffplay: use libswresample instead of av_audio_convert 2011-10-02 22:23:11 +02:00
ffprobe.c ffprobe: parse arguments for -print_format writer 2011-10-09 16:03:13 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-01 02:54:46 +02:00
INSTALL
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +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.