ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-27 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
f095391a14
FFmpeg/doc
History
Michael Niedermayer f095391a14 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  cdxl demux: do not create packets with uninitialized data at EOF.
  Replace computations of remaining bits with calls to get_bits_left().
  amrnb/amrwb: Remove get_bits usage.
  cosmetics: reindent
  avformat: do not require a pixel/sample format if there is no decoder
  avformat: do not fill-in audio packet duration in compute_pkt_fields()
  lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
  dca_parser: parse the sample rate and frame durations
  libspeexdec: do not set AVCodecContext.frame_size
  libopencore-amr: do not set AVCodecContext.frame_size
  alsdec: do not set AVCodecContext.frame_size
  siff: do not set AVCodecContext.frame_size
  amr demuxer: do not set AVCodecContext.frame_size.
  aiffdec: do not set AVCodecContext.frame_size
  mov: do not set AVCodecContext.frame_size
  ape: do not set AVCodecContext.frame_size.
  rdt: remove workaround for infinite loop with aac
  avformat: do not require frame_size in avformat_find_stream_info() for CELT
  avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
  avformat: do not require frame_size in avformat_find_stream_info() for AAC
  ...

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/h264_ps.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/dsputil_mmx.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-06 06:03:32 +01:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
decoders.texi lavc: add ffwavesynth pseudo-codec. 2011-12-15 18:38:04 +01:00
demuxers.texi lavf: add SBG demuxer. 2011-12-15 18:38:06 +01:00
developer.texi doc: make developer.texi point to correct fate doc 2011-12-20 18:12:36 +01:00
encoders.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
errno.txt doc: add a list of errno codes on some systems. 2011-12-21 19:59:45 +01:00
eval.texi eval: add root() to solve f(x)=0 2012-02-27 00:00:55 +01:00
faq.texi faq: fix typo. 2012-01-24 16:03:09 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01: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' 2012-02-27 04:35:35 +01:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi ffplay: add 10 minute seek support to ffplay 2011-12-14 21:09:08 +01:00
ffprobe.texi ffprobe: add count_frames and count_packets options 2012-02-17 01:06:43 +01:00
ffprobe.xsd ffprobe: report bit rate in stream description 2012-02-20 17:46:26 +01:00
ffserver.conf Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
filters.texi lavfi: add blackdetect filter 2012-03-04 12:31:06 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
indevs.texi Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Makefile doc: build: TEXIDEP: Recognize verbatim includes 2011-12-24 02:56:52 +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' 2012-03-01 03:17:11 +01:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
platform.texi Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
protocols.texi bluray protocol 2012-03-03 04:30:49 +01:00
rate_distortion.txt The definition of rate and distortion is not conditional of lambda being 2009-03-30 10:39:20 +00:00
RELEASE_NOTES RELEASE_NOTES: update for 0.10 2012-01-26 21:59:09 +01:00
snow.txt
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt Update tablegen documentation for WRITE_ARRAY macro. 2010-06-27 14:31:50 +00:00
texi2pod.pl doc: replace @pxref by @ref where appropriate 2011-07-09 21:53:59 +02:00
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00