virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
12d2bbf324
FFmpeg/doc
History
Michael Niedermayer c581cb4e4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 16:20:30 +02:00
..
doxy
examples Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
APIchanges Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
avtools-common-opts.texi doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section 2012-07-20 12:56:28 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi lavf/img2dec: add and document pattern_type option 2012-08-08 23:43:36 +02:00
developer.texi Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
encoders.texi doc/encoders: update libvpxenc mappings 2012-06-13 11:33:00 +02:00
errno.txt
eval.texi Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
faq.texi faq: suggest the concat filter. 2012-07-28 18:16:55 +02:00
fate.texi doc/fate: Rework examples to a section of its own 2012-07-05 10:55:49 +02:00
ffmpeg.texi ffmpeg: add an option to fix subtitles durations. 2012-08-14 11:17:45 +02:00
ffmpeg.txt
ffplay.texi doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
ffprobe.texi ffprobe: add -show_data option. 2012-06-18 09:38:36 +02:00
ffprobe.xsd ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
ffserver.conf
ffserver.texi
filter_design.txt filter_design: document ownership and permissions. 2012-08-14 12:12:20 +02:00
filters.texi lavfi/hue: add named options support 2012-08-16 15:01:05 +02:00
general.texi Add ICO muxer 2012-08-14 16:54:25 +02:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
git-howto.txt
indevs.texi doc/indevs: document missing options in x11grab section 2012-08-08 23:43:37 +02:00
issue_tracker.txt
Makefile build: extend documentation building mechanism 2012-08-13 12:22:02 +02:00
metadata.texi
mips.txt doc: add documentation regarding MIPS optimizations 2012-07-03 22:06:10 +02:00
multithreading.txt
muxers.texi Add ICO muxer 2012-08-14 16:54:25 +02:00
optimization.txt
outdevs.texi lavd/caca: rename "colors" option to "color" 2012-07-22 10:31:33 +02:00
platform.texi Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
print_options.c
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rate_distortion.txt
RELEASE_NOTES release_notes: update 2012-05-25 17:27:40 +02:00
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi doc/syntax: escape '@' to fix a warning. 2012-05-29 07:40:58 +02:00
t2h.init doc: declare encoding for texi2html. 2012-07-22 12:48:57 +02:00
tablegen.txt
texi2pod.pl doc/texi2pod: add "use warnings" directive 2012-08-12 23:52:55 +02:00
viterbi.txt