nut: store and read the r_frame_rate

With this, when we use a finer timebase than neccessary to store
durations the demuxer still knows what the original timebase was.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 32 insertions, 32 deletions

diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index 19fa7b886a..beaff81ce2 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -11,7 +11,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "403",
+            "pos": "477",
             "flags": "K"
         },
         {
@@ -24,7 +24,7 @@
             "pkt_dts_time": "0.000000",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "403",
+            "pkt_pos": "477",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -40,7 +40,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "2478",
+            "pos": "2552",
             "flags": "K"
         },
         {
@@ -53,7 +53,7 @@
             "pkt_dts_time": "0.000000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "2478",
+            "pkt_pos": "2552",
             "width": 320,
             "height": 240,
             "pix_fmt": "rgb24",
@@ -77,7 +77,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "232899",
+            "pos": "232973",
             "flags": "K"
         },
         {
@@ -90,7 +90,7 @@
             "pkt_dts_time": "0.000000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "232899",
+            "pkt_pos": "232973",
             "width": 100,
             "height": 100,
             "pix_fmt": "rgb24",
@@ -114,7 +114,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "262904",
+            "pos": "262978",
             "flags": "K"
         },
         {
@@ -127,7 +127,7 @@
             "pkt_dts_time": "0.023220",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "262904",
+            "pkt_pos": "262978",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -143,7 +143,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "264980",
+            "pos": "265054",
             "flags": "K"
         },
         {
@@ -156,7 +156,7 @@
             "pkt_dts_time": "0.040000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "264980",
+            "pkt_pos": "265054",
             "width": 320,
             "height": 240,
             "pix_fmt": "rgb24",
@@ -180,7 +180,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "495402",
+            "pos": "495476",
             "flags": "K"
         },
         {
@@ -193,7 +193,7 @@
             "pkt_dts_time": "0.040000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "495402",
+            "pkt_pos": "495476",
             "width": 100,
             "height": 100,
             "pix_fmt": "rgb24",
@@ -217,7 +217,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "525407",
+            "pos": "525481",
             "flags": "K"
         },
         {
@@ -230,7 +230,7 @@
             "pkt_dts_time": "0.046440",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "525407",
+            "pkt_pos": "525481",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -246,7 +246,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "527478",
+            "pos": "527552",
             "flags": "K"
         },
         {
@@ -259,7 +259,7 @@
             "pkt_dts_time": "0.069660",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "527478",
+            "pkt_pos": "527552",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -275,7 +275,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "529554",
+            "pos": "529628",
             "flags": "K"
         },
         {
@@ -288,7 +288,7 @@
             "pkt_dts_time": "0.080000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "529554",
+            "pkt_pos": "529628",
             "width": 320,
             "height": 240,
             "pix_fmt": "rgb24",
@@ -312,7 +312,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "759976",
+            "pos": "760050",
             "flags": "K"
         },
         {
@@ -325,7 +325,7 @@
             "pkt_dts_time": "0.080000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "759976",
+            "pkt_pos": "760050",
             "width": 100,
             "height": 100,
             "pix_fmt": "rgb24",
@@ -349,7 +349,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "789981",
+            "pos": "790055",
             "flags": "K"
         },
         {
@@ -362,7 +362,7 @@
             "pkt_dts_time": "0.092880",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "789981",
+            "pkt_pos": "790055",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -378,7 +378,7 @@
             "duration": 1024,
             "duration_time": "0.023220",
             "size": "2048",
-            "pos": "792052",
+            "pos": "792126",
             "flags": "K"
         },
         {
@@ -391,7 +391,7 @@
             "pkt_dts_time": "0.116100",
             "pkt_duration": 1024,
             "pkt_duration_time": "0.023220",
-            "pkt_pos": "792052",
+            "pkt_pos": "792126",
             "sample_fmt": "s16",
             "nb_samples": 1024,
             "channels": 1
@@ -407,7 +407,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "230400",
-            "pos": "794128",
+            "pos": "794202",
             "flags": "K"
         },
         {
@@ -420,7 +420,7 @@
             "pkt_dts_time": "0.120000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "794128",
+            "pkt_pos": "794202",
             "width": 320,
             "height": 240,
             "pix_fmt": "rgb24",
@@ -444,7 +444,7 @@
             "duration": 1,
             "duration_time": "0.040000",
             "size": "30000",
-            "pos": "1024550",
+            "pos": "1024624",
             "flags": "K"
         },
         {
@@ -457,7 +457,7 @@
             "pkt_dts_time": "0.120000",
             "pkt_duration": 1,
             "pkt_duration_time": "0.040000",
-            "pkt_pos": "1024550",
+            "pkt_pos": "1024624",
             "width": 100,
             "height": 100,
             "pix_fmt": "rgb24",
@@ -488,8 +488,8 @@
             "time_base": "1/44100",
             "start_pts": 0,
             "start_time": "0.000000",
-            "duration_ts": 527313,
-            "duration": "11.957211",
+            "duration_ts": 527350,
+            "duration": "11.958050",
             "bit_rate": "705600",
             "nb_read_frames": "6",
             "nb_read_packets": "6",
@@ -588,8 +588,8 @@
         "format_name": "nut",
         "start_time": "0.000000",
         "duration": "11.960000",
-        "size": "1054625",
-        "bit_rate": "705434",
+        "size": "1054699",
+        "bit_rate": "705484",
         "tags": {
             "title": "ffprobe test file",
             "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">",