From c25324894b34f4834e66d8e1c17ded69e742cf4f Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Wed, 18 Nov 2020 16:04:10 +0100
Subject: [PATCH] v1.0.6

---
 conda/meta.yaml            |  2 +-
 docs/parameters_tgrabs.rst | 10 ++++++++++
 docs/parameters_trex.rst   |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/conda/meta.yaml b/conda/meta.yaml
index 854d7e1..a355e5a 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: trex
-  version: "1.0.6"
+  version: "{{ load_setup_py_data().version }}"
   
 source:
     git_url: https://github.com/mooch443/trex.git
diff --git a/docs/parameters_tgrabs.rst b/docs/parameters_tgrabs.rst
index 4e9ed17..be081d4 100644
--- a/docs/parameters_tgrabs.rst
+++ b/docs/parameters_tgrabs.rst
@@ -199,6 +199,16 @@ TGrabs parameters
 
 
 
+.. function:: ffmpeg_crf(uint)
+	:noindex:
+
+	**default value:** 20
+
+
+	Quality for crf (see ffmpeg documentation) used when encoding as libx264.
+
+
+
 .. function:: grabber_force_settings(bool)
 	:noindex:
 
diff --git a/docs/parameters_trex.rst b/docs/parameters_trex.rst
index 1393bde..a899456 100644
--- a/docs/parameters_trex.rst
+++ b/docs/parameters_trex.rst
@@ -1891,7 +1891,7 @@ TRex parameters
 
 .. function:: version(string)
 
-	**default value:** "1.0.5"
+	**default value:** "1.0.6"
 
 
 	Current application version.
-- 
GitLab