diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 01:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 02:08:59 +0200 |
| commit | 70d9fb696393277247101da47e67d568a6aea4d9 (patch) | |
| tree | adba052f93445216b060f2afd0dbefd76644d84a /ffpresets | |
| parent | 35674a29b7f6cff70e3998b5d90feb693c817196 (diff) | |
| parent | d97ca425efeb468bc8e9db891385a909883177bb (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffpresets')
| -rw-r--r-- | ffpresets/libvpx-1080p.avpreset | 17 | ||||
| -rw-r--r-- | ffpresets/libvpx-1080p50_60.avpreset | 17 | ||||
| -rw-r--r-- | ffpresets/libvpx-360p.avpreset | 16 | ||||
| -rw-r--r-- | ffpresets/libvpx-720p.avpreset | 17 | ||||
| -rw-r--r-- | ffpresets/libvpx-720p50_60.avpreset | 17 |
5 files changed, 84 insertions, 0 deletions
diff --git a/ffpresets/libvpx-1080p.avpreset b/ffpresets/libvpx-1080p.avpreset new file mode 100644 index 0000000000..5c7da6fb86 --- /dev/null +++ b/ffpresets/libvpx-1080p.avpreset @@ -0,0 +1,17 @@ +g=120 +lag-in-frames=16 +deadline=good +cpu-used=0 +profile=1 +qmax=51 +qmin=11 +slices=4 +b=2M + +#ignored unless using -pass 2 +maxrate=24M +minrate=100k +auto-alt-ref=1 +arnr-maxframes=7 +arnr-strength=5 +arnr-type=centered diff --git a/ffpresets/libvpx-1080p50_60.avpreset b/ffpresets/libvpx-1080p50_60.avpreset new file mode 100644 index 0000000000..d42f731744 --- /dev/null +++ b/ffpresets/libvpx-1080p50_60.avpreset @@ -0,0 +1,17 @@ +g=120 +lag-in-frames=25 +deafline=good +cpu-used=0 +profile=1 +qmax=51 +qmin=11 +slices=4 +b=2M + +#ignored unless using -pass 2 +maxrate=24M +minrate=100k +auto-alt-ref=1 +arnr-maxframes=7 +arnr-strength=5 +arnr-type=centered diff --git a/ffpresets/libvpx-360p.avpreset b/ffpresets/libvpx-360p.avpreset new file mode 100644 index 0000000000..2cb9e380f3 --- /dev/null +++ b/ffpresets/libvpx-360p.avpreset @@ -0,0 +1,16 @@ +g=120 +lag-in-frames=16 +deadline=good +cpu-used=0 +profile=0 +qmax=63 +qmin=0 +b=768k + +#ignored unless using -pass 2 +maxrate=1.5M +minrate=40k +auto-alt-ref=1 +arnr-maxframes=7 +arnr-strength=5 +arnr-type=centered diff --git a/ffpresets/libvpx-720p.avpreset b/ffpresets/libvpx-720p.avpreset new file mode 100644 index 0000000000..3c7e396ad6 --- /dev/null +++ b/ffpresets/libvpx-720p.avpreset @@ -0,0 +1,17 @@ +g=120 +lag-in-frames=16 +deadline=good +cpu-used=0 +profile=0 +qmax=51 +qmin=11 +slices=4 +b=2M + +#ignored unless using -pass 2 +maxrate=24M +minrate=100k +auto-alt-ref=1 +arnr-maxframes=7 +arnr-strength=5 +arnr-type=centered diff --git a/ffpresets/libvpx-720p50_60.avpreset b/ffpresets/libvpx-720p50_60.avpreset new file mode 100644 index 0000000000..613930063e --- /dev/null +++ b/ffpresets/libvpx-720p50_60.avpreset @@ -0,0 +1,17 @@ +g=120 +lag-in-frames=25 +deadline=good +cpu-used=0 +profile=0 +qmax=51 +qmin=11 +slices=4 +b=2M + +#ignored unless using -pass 2 +maxrate=24M +minrate=100k +auto-alt-ref=1 +arnr-maxframes=7 +arnr-strength=5 +arnr-type=centered |