diff options
Diffstat (limited to 'presets')
35 files changed, 21 insertions, 51 deletions
diff --git a/presets/libvpx-1080p.avpreset b/presets/libvpx-1080p.ffpreset index 5c7da6fb86..cf25932100 100644 --- a/presets/libvpx-1080p.avpreset +++ b/presets/libvpx-1080p.ffpreset @@ -1,8 +1,10 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good cpu-used=0 -profile=1 +vprofile=1 qmax=51 qmin=11 slices=4 diff --git a/presets/libvpx-1080p50_60.avpreset b/presets/libvpx-1080p50_60.ffpreset index f85d3d6486..4a88040d34 100644 --- a/presets/libvpx-1080p50_60.avpreset +++ b/presets/libvpx-1080p50_60.ffpreset @@ -1,8 +1,10 @@ +vcodec=libvpx + g=120 lag-in-frames=25 deadline=good cpu-used=0 -profile=1 +vprofile=1 qmax=51 qmin=11 slices=4 diff --git a/presets/libvpx-360p.avpreset b/presets/libvpx-360p.ffpreset index 2cb9e380f3..f9729ba2bb 100644 --- a/presets/libvpx-360p.avpreset +++ b/presets/libvpx-360p.ffpreset @@ -1,8 +1,10 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good cpu-used=0 -profile=0 +vprofile=0 qmax=63 qmin=0 b=768k diff --git a/presets/libvpx-720p.avpreset b/presets/libvpx-720p.ffpreset index 3c7e396ad6..e84cc150cd 100644 --- a/presets/libvpx-720p.avpreset +++ b/presets/libvpx-720p.ffpreset @@ -1,8 +1,10 @@ +vcodec=libvpx + g=120 lag-in-frames=16 deadline=good cpu-used=0 -profile=0 +vprofile=0 qmax=51 qmin=11 slices=4 diff --git a/presets/libvpx-720p50_60.avpreset b/presets/libvpx-720p50_60.ffpreset index 613930063e..8fce2bfb5a 100644 --- a/presets/libvpx-720p50_60.avpreset +++ b/presets/libvpx-720p50_60.ffpreset @@ -1,8 +1,10 @@ +vcodec=libvpx + g=120 lag-in-frames=25 deadline=good cpu-used=0 -profile=0 +vprofile=0 qmax=51 qmin=11 slices=4 diff --git a/presets/libx264-baseline.avpreset b/presets/libx264-baseline.avpreset deleted file mode 100644 index 0626e28440..0000000000 --- a/presets/libx264-baseline.avpreset +++ /dev/null @@ -1 +0,0 @@ -profile=baseline diff --git a/presets/libx264-fast.avpreset b/presets/libx264-fast.avpreset deleted file mode 100644 index a8c526e8b4..0000000000 --- a/presets/libx264-fast.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=fast diff --git a/presets/libx264-fast_firstpass.avpreset b/presets/libx264-fast_firstpass.avpreset deleted file mode 100644 index d9cf5afe0e..0000000000 --- a/presets/libx264-fast_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=fast -fastfirstpass=1 diff --git a/presets/libx264-faster.avpreset b/presets/libx264-faster.avpreset deleted file mode 100644 index e311989bbb..0000000000 --- a/presets/libx264-faster.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=faster diff --git a/presets/libx264-faster_firstpass.avpreset b/presets/libx264-faster_firstpass.avpreset deleted file mode 100644 index 48a2d443bc..0000000000 --- a/presets/libx264-faster_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=faster -fastfirstpass=1 diff --git a/presets/libx264-ipod320.avpreset b/presets/libx264-ipod320.ffpreset index 6323191740..76722bd6dd 100644 --- a/presets/libx264-ipod320.avpreset +++ b/presets/libx264-ipod320.ffpreset @@ -1,4 +1,6 @@ -profile=baseline +vcodec=libx264 + +vprofile=baseline level=13 maxrate=768000 bufsize=3000000 diff --git a/presets/libx264-ipod640.avpreset b/presets/libx264-ipod640.ffpreset index c2c3e1a88e..51f7564275 100644 --- a/presets/libx264-ipod640.avpreset +++ b/presets/libx264-ipod640.ffpreset @@ -1,4 +1,6 @@ -profile=baseline +vcodec=libx264 + +vprofile=baseline level=30 maxrate=10000000 bufsize=10000000 diff --git a/presets/libx264-lossless_fast.avpreset b/presets/libx264-lossless_fast.avpreset deleted file mode 100644 index 1658d563aa..0000000000 --- a/presets/libx264-lossless_fast.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=fast -qp=0 diff --git a/presets/libx264-lossless_max.avpreset b/presets/libx264-lossless_max.avpreset deleted file mode 100644 index c25ff32d16..0000000000 --- a/presets/libx264-lossless_max.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=placebo -qp=0 diff --git a/presets/libx264-lossless_medium.avpreset b/presets/libx264-lossless_medium.avpreset deleted file mode 100644 index f7b1d81f39..0000000000 --- a/presets/libx264-lossless_medium.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=medium -qp=0 diff --git a/presets/libx264-lossless_slow.avpreset b/presets/libx264-lossless_slow.avpreset deleted file mode 100644 index a15ff4c426..0000000000 --- a/presets/libx264-lossless_slow.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=slow -qp=0 diff --git a/presets/libx264-lossless_slower.avpreset b/presets/libx264-lossless_slower.avpreset deleted file mode 100644 index bd71f03291..0000000000 --- a/presets/libx264-lossless_slower.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=slower -qp=0 diff --git a/presets/libx264-lossless_ultrafast.avpreset b/presets/libx264-lossless_ultrafast.avpreset deleted file mode 100644 index 4d71eb72aa..0000000000 --- a/presets/libx264-lossless_ultrafast.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=ultrafast -qp=0 diff --git a/presets/libx264-main.avpreset b/presets/libx264-main.avpreset deleted file mode 100644 index 336c69b3af..0000000000 --- a/presets/libx264-main.avpreset +++ /dev/null @@ -1 +0,0 @@ -profile=main diff --git a/presets/libx264-medium.avpreset b/presets/libx264-medium.avpreset deleted file mode 100644 index 261d584f95..0000000000 --- a/presets/libx264-medium.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=medium diff --git a/presets/libx264-medium_firstpass.avpreset b/presets/libx264-medium_firstpass.avpreset deleted file mode 100644 index 06c8f9f8fb..0000000000 --- a/presets/libx264-medium_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=medium -fastfirstpass=1 diff --git a/presets/libx264-placebo.avpreset b/presets/libx264-placebo.avpreset deleted file mode 100644 index 93d721d004..0000000000 --- a/presets/libx264-placebo.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=placebo diff --git a/presets/libx264-placebo_firstpass.avpreset b/presets/libx264-placebo_firstpass.avpreset deleted file mode 100644 index c8099e50c7..0000000000 --- a/presets/libx264-placebo_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=placebo -fastfirstpass=1 diff --git a/presets/libx264-slow.avpreset b/presets/libx264-slow.avpreset deleted file mode 100644 index 85778ec8ba..0000000000 --- a/presets/libx264-slow.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=slow diff --git a/presets/libx264-slow_firstpass.avpreset b/presets/libx264-slow_firstpass.avpreset deleted file mode 100644 index 9998bc95a2..0000000000 --- a/presets/libx264-slow_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=slow -fastfirstpass=1 diff --git a/presets/libx264-slower.avpreset b/presets/libx264-slower.avpreset deleted file mode 100644 index 87d69893f2..0000000000 --- a/presets/libx264-slower.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=slower diff --git a/presets/libx264-slower_firstpass.avpreset b/presets/libx264-slower_firstpass.avpreset deleted file mode 100644 index c798b82872..0000000000 --- a/presets/libx264-slower_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=slower -fastfirstpass=1 diff --git a/presets/libx264-superfast.avpreset b/presets/libx264-superfast.avpreset deleted file mode 100644 index 1c117ecf60..0000000000 --- a/presets/libx264-superfast.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=superfast diff --git a/presets/libx264-superfast_firstpass.avpreset b/presets/libx264-superfast_firstpass.avpreset deleted file mode 100644 index fc70e0970b..0000000000 --- a/presets/libx264-superfast_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=superfast -fastfirstpass=1 diff --git a/presets/libx264-ultrafast.avpreset b/presets/libx264-ultrafast.avpreset deleted file mode 100644 index 910330188f..0000000000 --- a/presets/libx264-ultrafast.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=ultrafast diff --git a/presets/libx264-ultrafast_firstpass.avpreset b/presets/libx264-ultrafast_firstpass.avpreset deleted file mode 100644 index e3aaa17a2e..0000000000 --- a/presets/libx264-ultrafast_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=ultrafast -fastfirstpass=1 diff --git a/presets/libx264-veryfast.avpreset b/presets/libx264-veryfast.avpreset deleted file mode 100644 index fa49629b35..0000000000 --- a/presets/libx264-veryfast.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=veryfast diff --git a/presets/libx264-veryfast_firstpass.avpreset b/presets/libx264-veryfast_firstpass.avpreset deleted file mode 100644 index 4909030551..0000000000 --- a/presets/libx264-veryfast_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=veryfast -fastfirstpass=1 diff --git a/presets/libx264-veryslow.avpreset b/presets/libx264-veryslow.avpreset deleted file mode 100644 index 7e01c8f5c1..0000000000 --- a/presets/libx264-veryslow.avpreset +++ /dev/null @@ -1 +0,0 @@ -preset=veryslow diff --git a/presets/libx264-veryslow_firstpass.avpreset b/presets/libx264-veryslow_firstpass.avpreset deleted file mode 100644 index daf5a8f4d5..0000000000 --- a/presets/libx264-veryslow_firstpass.avpreset +++ /dev/null @@ -1,2 +0,0 @@ -preset=veryslow -fastfirstpass=1 |