diff options
| author | Clément Bœsch | 2012-05-03 22:01:32 +0200 |
|---|---|---|
| committer | Clément Bœsch | 2012-05-04 18:40:36 +0200 |
| commit | ec271c95794693ce1376a95b0f319e5892460123 (patch) | |
| tree | 603a9ecc7cf8f1158f1be632edb15358130e7e66 /presets | |
| parent | 19bc2320f3b337c196689e546d5b86a4f12244aa (diff) | |
presets: specify the codecs.
This allows the following usages:
FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vcodec libx264 -vpre ipod640 -f null -
FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vpre libx264-ipod640 -f null -
The second example was broken even if documented.
Diffstat (limited to 'presets')
| -rw-r--r-- | presets/libvpx-1080p.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libvpx-1080p50_60.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libvpx-360p.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libvpx-720p.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libvpx-720p50_60.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libx264-ipod320.ffpreset | 2 | ||||
| -rw-r--r-- | presets/libx264-ipod640.ffpreset | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/presets/libvpx-1080p.ffpreset b/presets/libvpx-1080p.ffpreset index a2accba7ff..cf25932100 100644 --- a/presets/libvpx-1080p.ffpreset +++ b/presets/libvpx-1080p.ffpreset @@ -1,3 +1,5 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good diff --git a/presets/libvpx-1080p50_60.ffpreset b/presets/libvpx-1080p50_60.ffpreset index 3d29f9bf87..4a88040d34 100644 --- a/presets/libvpx-1080p50_60.ffpreset +++ b/presets/libvpx-1080p50_60.ffpreset @@ -1,3 +1,5 @@ +vcodec=libvpx + g=120 lag-in-frames=25 deadline=good diff --git a/presets/libvpx-360p.ffpreset b/presets/libvpx-360p.ffpreset index 36fd11af43..f9729ba2bb 100644 --- a/presets/libvpx-360p.ffpreset +++ b/presets/libvpx-360p.ffpreset @@ -1,3 +1,5 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good diff --git a/presets/libvpx-720p.ffpreset b/presets/libvpx-720p.ffpreset index ba7791d544..e84cc150cd 100644 --- a/presets/libvpx-720p.ffpreset +++ b/presets/libvpx-720p.ffpreset @@ -1,3 +1,5 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good diff --git a/presets/libvpx-720p50_60.ffpreset b/presets/libvpx-720p50_60.ffpreset index b339774e78..8fce2bfb5a 100644 --- a/presets/libvpx-720p50_60.ffpreset +++ b/presets/libvpx-720p50_60.ffpreset @@ -1,3 +1,5 @@ +vcodec=libvpx + g=120 lag-in-frames=25 deadline=good diff --git a/presets/libx264-ipod320.ffpreset b/presets/libx264-ipod320.ffpreset index 6abacbd72c..76722bd6dd 100644 --- a/presets/libx264-ipod320.ffpreset +++ b/presets/libx264-ipod320.ffpreset @@ -1,3 +1,5 @@ +vcodec=libx264 + vprofile=baseline level=13 maxrate=768000 diff --git a/presets/libx264-ipod640.ffpreset b/presets/libx264-ipod640.ffpreset index cda7c08752..51f7564275 100644 --- a/presets/libx264-ipod640.ffpreset +++ b/presets/libx264-ipod640.ffpreset @@ -1,3 +1,5 @@ +vcodec=libx264 + vprofile=baseline level=30 maxrate=10000000 |