1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

5 Commits

Author SHA1 Message Date
Lou Logan
1e09d9085d Remove redundant libx264 preset files
These are available via -preset or -vprofile and the addition of
-qp 0 or -crf 0 if lossless is desired.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22 01:32:10 +02:00
Lou Logan
4aeaba4757 presets: spelling error in libvpx 1080p50_60
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21 00:20:33 +02:00
Michael Niedermayer
e6e86e64c3 presets: favor vprofile over profile to avoid conflicts with audio profiles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 16:36:52 +02:00
Michael Niedermayer
d0492578c8 Merge remote-tracking branch 'qatar/master'
* 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>
2011-10-20 02:34:51 +02:00
Janne Grunau
8096fdf0b6 presets: rename presets directory 2011-10-19 21:20:17 +02:00