FFmpeg

Mirror of https://git.ffmpeg.org/ffmpeg.git https://ffmpeg.org/

Michael Niedermayer 787be6d074 Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89' * commit '6f273093e54cba130f3ffde3d6433e74baa4ad89': LucasArts SMUSH VIMA audio decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavcodec/vima.c This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition to the previously used name "vima" These changes are needed for compatibility with the renamed codec in libav See: `b18357326c` and others Merged-by: Michael Niedermayer <michaelni@gmx.at>		11 years ago
..
examples	examples/avio_reading: fix null dereference on error	11 years ago
APIchanges	Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'	11 years ago
Doxyfile	Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'	11 years ago
Makefile	doc/examples: Add example transcoding.c	11 years ago
RELEASE_NOTES	RELEASE_NOTES: mention new filters	11 years ago
authors.texi	…
bitstream_filters.texi	…
build_system.txt	…
codecs.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	11 years ago
decoders.texi	Fix texinfo error due to wrong @subsubsection	11 years ago
default.css	…
demuxers.texi	lavf/concatdec: allow to match streams by id.	11 years ago
developer.texi	Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'	11 years ago
devices.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	11 years ago
doxy-wrapper.sh	Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'	11 years ago
encoders.texi	Fix spelling errors in texi files: more informations --> more information allows to --> allows one to	11 years ago
errno.txt	…
faq.texi	doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry	11 years ago
fate.texi	…
fate_config.sh.template	…
ffmpeg-bitstream-filters.texi	…
ffmpeg-codecs.texi	…
ffmpeg-devices.texi	…
ffmpeg-filters.texi	…
ffmpeg-formats.texi	…
ffmpeg-protocols.texi	…
ffmpeg-resampler.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	11 years ago
ffmpeg-scaler.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	11 years ago
ffmpeg-utils.texi	…
ffmpeg.texi	doc/ffmpeg: restore ascii arrows in Simple filtergraphs	11 years ago
ffmpeg.txt	…
ffplay.texi	Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'	11 years ago
ffprobe.texi	doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all	11 years ago
ffprobe.xsd	…
ffserver.conf	ffserver: add stream Metadata option	11 years ago
ffserver.texi	Fix spelling errors in texi files: more informations --> more information allows to --> allows one to	11 years ago
fftools-common-opts.texi	Merge remote-tracking branch 'qatar/master'	11 years ago
filter_design.txt	…
filters.texi	Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'	11 years ago
formats.texi	avformat/options_table: add named constants for avoid_negative_ts	11 years ago
general.texi	Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'	11 years ago
git-howto.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	11 years ago
indevs.texi	Add Win32 GDI-based screen grabbing	11 years ago
issue_tracker.txt	…
libavcodec.texi	…
libavdevice.texi	…
libavfilter.texi	…
libavformat.texi	…
libavutil.texi	…
libswresample.texi	…
libswscale.texi	…
metadata.texi	…
mips.txt	…
multithreading.txt	…
muxers.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	11 years ago
nut.texi	…
optimization.txt	Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'	11 years ago
outdevs.texi	Fix spelling errors in texi files: more informations --> more information allows to --> allows one to	11 years ago
platform.texi	doc/platform: mention that yuvis gas-preprocessor is currently missing some changes	11 years ago
print_options.c	…
protocols.texi	udp: mention default in documentation	11 years ago
rate_distortion.txt	…
resampler.texi	…
scaler.texi	swscale: add two spatially stable dithering methods	11 years ago
snow.txt	…
swresample.txt	…
swscale.txt	…
t2h.init	…
tablegen.txt	…
texi2pod.pl	doc/texi2pod: fix encoding type	11 years ago
texidep.pl	…
utils.texi	Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission	11 years ago