virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity
FFmpeg/doc
History
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: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:14:23 +02:00
..
examples
examples/avio_reading: fix null dereference on error
2014-04-06 00:39:58 +02:00
APIchanges
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
2014-04-04 22:52:12 +02:00
authors.texi
…
bitstream_filters.texi
doc/bitstream_filters: remove mp3_header_decompress filter
2013-12-14 21:47:51 +01:00
build_system.txt
…
codecs.texi
doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all
2014-01-09 12:12:10 +01:00
decoders.texi
Fix texinfo error due to wrong @subsubsection
2014-03-27 03:58:29 +01:00
default.css
doc/default.css: sync with ffmpeg-web
2013-11-28 10:27:25 +01:00
demuxers.texi
lavf/concatdec: allow to match streams by id.
2014-03-23 19:15:07 +01:00
developer.texi
Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'
2013-12-23 12:52:50 +01:00
devices.texi
doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all
2014-01-09 12:12:10 +01:00
doxy-wrapper.sh
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
Doxyfile
Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'
2014-02-14 14:38:21 +01:00
encoders.texi
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
2014-03-27 03:58:56 +01:00
errno.txt
…
faq.texi
doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry
2014-01-03 17:05:44 +01:00
fate_config.sh.template
…
fate.texi
…
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
2014-03-06 21:12:40 +01:00
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
2014-03-06 21:12:40 +01:00
ffmpeg-utils.texi
…
ffmpeg.texi
doc/ffmpeg: restore ascii arrows in Simple filtergraphs
2014-04-03 19:25:15 +02:00
ffmpeg.txt
…
ffplay.texi
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
2014-02-10 13:26:31 +01:00
ffprobe.texi
doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all
2014-01-09 12:12:10 +01:00
ffprobe.xsd
ffprobe: show best_effort_timestamp in the frame section
2013-12-15 10:46:46 +01:00
ffserver.conf
ffserver: add stream Metadata option
2013-12-16 19:18:45 +01:00
ffserver.texi
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
2014-03-27 03:58:56 +01:00
fftools-common-opts.texi
Merge remote-tracking branch 'qatar/master'
2014-03-13 14:21:27 +01:00
filter_design.txt
…
filters.texi
Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'
2014-04-05 00:16:53 +02:00
formats.texi
avformat/options_table: add named constants for avoid_negative_ts
2014-02-24 19:46:11 +01:00
general.texi
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
2014-04-06 23:14:23 +02:00
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
2014-03-06 21:12:40 +01:00
indevs.texi
Add Win32 GDI-based screen grabbing
2014-04-03 00:41:45 +02:00
issue_tracker.txt
…
libavcodec.texi
…
libavdevice.texi
…
libavfilter.texi
…
libavformat.texi
…
libavutil.texi
…
libswresample.texi
…
libswscale.texi
…
Makefile
doc/examples: Add example transcoding.c
2014-03-17 20:56:33 +01:00
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
2014-03-06 21:12:40 +01:00
nut.texi
…
optimization.txt
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
2014-03-22 23:26:23 +01:00
outdevs.texi
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
2014-03-27 03:58:56 +01:00
platform.texi
doc/platform: mention that yuvis gas-preprocessor is currently missing some changes
2014-03-12 23:08:41 +01:00
print_options.c
…
protocols.texi
udp: mention default in documentation
2014-03-25 17:53:14 +01:00
rate_distortion.txt
…
RELEASE_NOTES
RELEASE_NOTES: mention new filters
2014-03-23 17:30:52 +01:00
resampler.texi
…
scaler.texi
swscale: add two spatially stable dithering methods
2014-03-25 13:48:06 +01:00
snow.txt
…
swresample.txt
…
swscale.txt
…
t2h.init
…
tablegen.txt
…
texi2pod.pl
doc/texi2pod: fix encoding type
2014-03-13 03:54:48 +01:00
texidep.pl
doc: add script to compute texi files dependencies
2013-12-06 10:40:38 +01:00
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
2014-03-06 21:12:40 +01:00