1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer a7758884db Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
	cmdutils.c
	libavcodec/proresdec_lgpl.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 01:03:07 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
ffpresets presets: use private options in libx264-ipod ffpresets 2011-09-22 06:27:07 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
libavfilter vf_drawtext: do not set limitations on fontsize 2011-09-23 01:35:38 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
libpostproc libpostproc: mmx code uses stack below %esp, fix that 2011-09-20 21:37:00 +02:00
libswresample rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +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-09-24 01:03:07 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c cmdutils: move grow_array out of #if CONFIG_AVFILTER 2011-09-23 11:40:25 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +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 Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." 2011-09-21 14:12:00 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
ffprobe.c ffprobe: remove misplaced and pointless comment. 2011-09-22 00:22:53 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: loose svn reference 2011-09-23 19:18:58 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README
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
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.