1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/doc
Michael Niedermayer 78accb876c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
..
examples Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
APIchanges lavfi: add audio channel packing negotiation fields 2011-07-16 19:22:49 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
build_system.txt Revert some silly renamings that leaked in from a pull. 2011-03-29 02:27:13 +02:00
decoders.texi decoders.texi: fix typos in rawvideo section 2011-05-20 10:14:00 +02:00
demuxers.texi Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
developer.texi Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
encoders.texi doc: cosmetics: libx264 typos 2011-06-02 14:43:29 +02:00
eval.texi eval: add support for pow() function 2011-06-07 00:37:00 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-07-13 00:42:11 +02:00
fate.txt fate.txt: replace FATE rsync command with a make command 2011-05-27 10:41:46 +02:00
ffmpeg-mt-authorship.txt Include authorship information from ffmpeg-mt at Ronald S. Bultjes request. 2011-04-19 01:17:59 +02:00
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
ffplay.texi Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ffprobe.texi ffprobe: implement -i FILE option 2011-06-05 13:31:47 +02:00
ffserver.conf Update the url to the site website and change ffmpeg-devel to libav-devel 2011-03-13 18:45:29 -04:00
ffserver.texi Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
fftools-common-opts.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
filters.texi vf_mp: remove rgbtest wrapper 2011-07-15 01:44:57 +02:00
general.texi Merge commit 'b5849f77095439e994b11c25e6063d443b36c228' 2011-07-14 02:24:10 +02:00
git-howto.txt fix typo 2011-04-10 04:31:54 +02:00
indevs.texi lavdev: add openal input device 2011-06-27 15:26:14 +02:00
issue_tracker.txt doc: Remove outdated information about our issue tracker 2011-07-01 20:53:45 +02:00
libavfilter.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
Makefile build: create output directories as needed 2011-06-29 09:14:56 +01:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi sdl: use the filename for defining the window title, if not specified 2011-06-05 13:17:38 +02:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-07-13 00:42:11 +02:00
rate_distortion.txt
RELEASE_NOTES release_notes: document not fully understood mingw-sdl issue 2011-06-21 20:58:39 +02:00
snow.txt
soc.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl doc: replace @pxref by @ref where appropriate 2011-07-09 21:53:59 +02:00
viterbi.txt