mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
f9ecb849ef
* qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| examples | ||
| APIchanges | ||
| avutil.txt | ||
| bitstream_filters.texi | ||
| build_system.txt | ||
| decoders.texi | ||
| demuxers.texi | ||
| developer.texi | ||
| encoders.texi | ||
| eval.texi | ||
| faq.texi | ||
| fate.txt | ||
| ffmpeg-mt-authorship.txt | ||
| ffmpeg.texi | ||
| ffplay.texi | ||
| ffprobe.texi | ||
| ffserver.conf | ||
| ffserver.texi | ||
| fftools-common-opts.texi | ||
| filters.texi | ||
| general.texi | ||
| git-howto.txt | ||
| indevs.texi | ||
| issue_tracker.txt | ||
| libavfilter.texi | ||
| metadata.texi | ||
| multithreading.txt | ||
| muxers.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| snow.txt | ||
| soc.txt | ||
| swscale.txt | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| TODO | ||
| viterbi.txt | ||