presets: specify the codecs.

ubitux · ubitux · commit ec271c957946 · 2012-05-04T18:40:36.000+02:00
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.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+vcodec=libx264
+
 vprofile=baseline
 level=13
 maxrate=768000
diff --git a/presets/libx264-ipod640.ffpreset b/presets/libx264-ipod640.ffpreset
@@ -1,3 +1,5 @@
+vcodec=libx264
+
 vprofile=baseline
 level=30
 maxrate=10000000

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+vcodec=libvpx`
	`2`	`+`
`1`	`3`	`g=120`
`2`	`4`	`lag-in-frames=16`
`3`	`5`	`deadline=good`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+vcodec=libx264`
	`2`	`+`
`1`	`3`	`vprofile=baseline`
`2`	`4`	`level=13`
`3`	`5`	`maxrate=768000`