ffmpeg/doc
Michael Niedermayer 82db8ee321 Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier

Conflicts:
	Changelog
	ffmpeg.c
	libavcodec/libopusdec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 14:58:19 +02:00
..
doxy
examples
APIchanges APIchanges: fill hashes. 2012-09-30 20:43:26 +02:00
Makefile
RELEASE_NOTES
avtools-common-opts.texi
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi
encoders.texi
errno.txt
eval.texi
faq.texi
fate.texi
fate_config.sh.template
ffmpeg.texi
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffprobe.xsd ffprobe: extend disposition printing support 2012-09-30 12:22:19 +02:00
ffserver.conf
ffserver.texi
filter_design.txt
filters.texi lavfi/transpose: add passthrough option 2012-10-02 09:43:06 +02:00
general.texi Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
metadata.texi
mips.txt
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
platform.texi
print_options.c
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swresample.txt doc/swresample.txt: fix typos 2012-10-02 09:43:27 +02:00
swscale.txt
syntax.texi
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt