mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-23 19:49:56 +00:00
d0492578c8
* qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| libvpx-360p.ffpreset | ||
| libvpx-720p50_60.ffpreset | ||
| libvpx-720p.ffpreset | ||
| libvpx-1080p50_60.ffpreset | ||
| libvpx-1080p.ffpreset | ||
| libx264-baseline.ffpreset | ||
| libx264-fast_firstpass.ffpreset | ||
| libx264-fast.ffpreset | ||
| libx264-faster_firstpass.ffpreset | ||
| libx264-faster.ffpreset | ||
| libx264-ipod320.ffpreset | ||
| libx264-ipod640.ffpreset | ||
| libx264-lossless_fast.ffpreset | ||
| libx264-lossless_max.ffpreset | ||
| libx264-lossless_medium.ffpreset | ||
| libx264-lossless_slow.ffpreset | ||
| libx264-lossless_slower.ffpreset | ||
| libx264-lossless_ultrafast.ffpreset | ||
| libx264-main.ffpreset | ||
| libx264-medium_firstpass.ffpreset | ||
| libx264-medium.ffpreset | ||
| libx264-placebo_firstpass.ffpreset | ||
| libx264-placebo.ffpreset | ||
| libx264-slow_firstpass.ffpreset | ||
| libx264-slow.ffpreset | ||
| libx264-slower_firstpass.ffpreset | ||
| libx264-slower.ffpreset | ||
| libx264-superfast_firstpass.ffpreset | ||
| libx264-superfast.ffpreset | ||
| libx264-ultrafast_firstpass.ffpreset | ||
| libx264-ultrafast.ffpreset | ||
| libx264-veryfast_firstpass.ffpreset | ||
| libx264-veryfast.ffpreset | ||
| libx264-veryslow_firstpass.ffpreset | ||
| libx264-veryslow.ffpreset | ||