RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity
5ca392d119
ffmpeg/doc
History
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
..
examples Replace remaining av_new_stream() with avformat_new_stream(). 2011-11-05 15:07:19 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
encoders.texi doc: fix and clarify libx264 encoding. 2011-10-30 02:08:57 +02:00
eval.texi eval: add mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi ffmpeg: add -map_channel option. 2011-11-04 19:40:32 +01:00
ffmpeg.txt doc: small ascii diagram on I/O files and streams in ffmpeg.c 2011-10-12 15:43:52 +02:00
ffplay.texi ffplay.texi: document -codec 2011-09-27 22:00:20 +02:00
ffprobe.texi ffprobe: parse arguments for -print_format writer 2011-10-09 16:03:13 +02:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi af_aconvert: fix doc reference to unexisting chlayout.h file 2011-11-06 11:48:09 +01:00
general.texi Dirac decoding is supported natively. 2011-10-31 01:13:41 +01:00
git-howto.txt
indevs.texi dshow: support choosing between devices with same name 2011-11-06 01:19:56 +01:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi Remove reference to the libavfilter soc SVN repo, update libavfilter status description 2011-09-10 23:40:52 +02:00
Makefile
metadata.texi
multithreading.txt
muxers.texi doc: tiny spelling fix 2011-10-27 00:25:32 +02:00
optimization.txt
outdevs.texi
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt