diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
| commit | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch) | |
| tree | eeed5f77c8417a98fe5b8538d3c019d1cea00c04 /extra/ffmpeg | |
| parent | cdc66cc7110e78bf1197f9effc70422114f9341b (diff) | |
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/revert-enabling-threads.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/extra/ffmpeg/revert-enabling-threads.patch b/extra/ffmpeg/revert-enabling-threads.patch deleted file mode 100644 index dd50332ee..000000000 --- a/extra/ffmpeg/revert-enabling-threads.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Foptions.c;h=4ac92fd29e0a4e3bb6952b27240ac65b86671b27;hp=4ac9313f274f46eae85a144d6bb6fea30e67bea2;hb=e4e30256f87f177decf59b59e923d05ef64147df;hpb=c11b92b304334b1241ee79406dca6a03131fc921 - -diff --git a/libavcodec/options.c b/libavcodec/options.c -index 4ac9313..4ac92fd 100644 ---- a/libavcodec/options.c -+++ b/libavcodec/options.c -@@ -370,7 +370,7 @@ static const AVOption options[]={ - {"float", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_AA_FLOAT }, INT_MIN, INT_MAX, V|D, "aa"}, - #endif - {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, --{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 1 }, 0, INT_MAX, V|E|D, "threads"}, -+{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|E|D, "threads"}, - {"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.dbl = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, - {"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, - {"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, |