diff mbox series

[FFmpeg-devel,V3,1/1] ensure closed caption info which is visible in default stream dump is also available in results when -show_streams is used

Message ID 20200424194354.53156-2-hello.vectronic@gmail.com
State New
Headers show
Series ffprobe add closed caption output to stream info
Related show

Checks

Context Check Description
andriy/default pending
andriy/make_warn warning New warnings during build
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

vectronic April 24, 2020, 7:43 p.m. UTC
Signed-off-by: vectronic <hello.vectronic@gmail.com>
---
 doc/ffprobe.xsd                                           | 1 +
 fftools/ffprobe.c                                         | 2 ++
 tests/ref/fate/concat-demuxer-extended-lavf-mxf           | 2 +-
 tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10       | 2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf            | 2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10        | 2 +-
 tests/ref/fate/concat-demuxer-simple2-lavf-ts             | 2 +-
 tests/ref/fate/ffprobe_compact                            | 4 ++--
 tests/ref/fate/ffprobe_csv                                | 4 ++--
 tests/ref/fate/ffprobe_default                            | 2 ++
 tests/ref/fate/ffprobe_flat                               | 2 ++
 tests/ref/fate/ffprobe_ini                                | 2 ++
 tests/ref/fate/ffprobe_json                               | 2 ++
 tests/ref/fate/ffprobe_xml                                | 4 ++--
 tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 1 +
 tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 1 +
 tests/ref/fate/mov-zombie                                 | 2 +-
 tests/ref/fate/mxf-probe-d10                              | 1 +
 tests/ref/fate/mxf-probe-dnxhd                            | 1 +
 tests/ref/fate/mxf-probe-dv25                             | 1 +
 20 files changed, 28 insertions(+), 12 deletions(-)

Comments

Marton Balint April 25, 2020, 8:08 a.m. UTC | #1
On Fri, 24 Apr 2020, vectronic wrote:

> Signed-off-by: vectronic <hello.vectronic@gmail.com>
> ---
> doc/ffprobe.xsd                                           | 1 +
> fftools/ffprobe.c                                         | 2 ++
> tests/ref/fate/concat-demuxer-extended-lavf-mxf           | 2 +-
> tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10       | 2 +-
> tests/ref/fate/concat-demuxer-simple1-lavf-mxf            | 2 +-
> tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10        | 2 +-
> tests/ref/fate/concat-demuxer-simple2-lavf-ts             | 2 +-
> tests/ref/fate/ffprobe_compact                            | 4 ++--
> tests/ref/fate/ffprobe_csv                                | 4 ++--
> tests/ref/fate/ffprobe_default                            | 2 ++
> tests/ref/fate/ffprobe_flat                               | 2 ++
> tests/ref/fate/ffprobe_ini                                | 2 ++
> tests/ref/fate/ffprobe_json                               | 2 ++
> tests/ref/fate/ffprobe_xml                                | 4 ++--
> tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 1 +
> tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 1 +
> tests/ref/fate/mov-zombie                                 | 2 +-
> tests/ref/fate/mxf-probe-d10                              | 1 +
> tests/ref/fate/mxf-probe-dnxhd                            | 1 +
> tests/ref/fate/mxf-probe-dv25                             | 1 +
> 20 files changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
> index 97dc67def6..f88045232f 100644
> --- a/doc/ffprobe.xsd
> +++ b/doc/ffprobe.xsd
> @@ -227,6 +227,7 @@
>       <xsd:attribute name="coded_width"          type="xsd:int"/>
>       <xsd:attribute name="coded_height"         type="xsd:int"/>
>       <xsd:attribute name="has_b_frames"         type="xsd:int"/>
> +      <xsd:attribute name="closed_captions"      type="xsd:int"/>

xsd:boolean seems more appropriate, no?

>       <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
>       <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
>       <xsd:attribute name="pix_fmt"              type="xsd:string"/>
> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> index 840fcb71e2..f0916cbd70 100644
> --- a/fftools/ffprobe.c
> +++ b/fftools/ffprobe.c
> @@ -2550,6 +2550,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
>         }
> #endif
>         print_int("has_b_frames", par->video_delay);
> +        print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS));

Not strictly related to this patch, but maybe these FF_CODEC_PROPERTY_* 
constants should be promoted to AV_*?

>         sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL);
>         if (sar.num) {
>             print_q("sample_aspect_ratio", sar, ':');
> @@ -2950,6 +2951,7 @@ static int open_input_file(InputFile *ifile, const char *filename,
>
>             ist->dec_ctx->pkt_timebase = stream->time_base;
>             ist->dec_ctx->framerate = stream->avg_frame_rate;
> +            ist->dec_ctx->properties = stream->codec->properties;

This is using the depreacted stream->codec, so I think this should go 
under the #IF below.

> #if FF_API_LAVF_AVCTX
>             ist->dec_ctx->coded_width = stream->codec->coded_width;
>             ist->dec_ctx->coded_height = stream->codec->coded_height;

Regards,
Marton
vectronic April 25, 2020, 10:46 a.m. UTC | #2
> On 25 Apr 2020, at 09:08, Marton Balint <cus@passwd.hu> wrote:
> 
> 
> 
> On Fri, 24 Apr 2020, vectronic wrote:
> 
>> Signed-off-by: vectronic <hello.vectronic@gmail.com>
>> ---
>> doc/ffprobe.xsd                                           | 1 +
>> fftools/ffprobe.c                                         | 2 ++
>> tests/ref/fate/concat-demuxer-extended-lavf-mxf           | 2 +-
>> tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10       | 2 +-
>> tests/ref/fate/concat-demuxer-simple1-lavf-mxf            | 2 +-
>> tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10        | 2 +-
>> tests/ref/fate/concat-demuxer-simple2-lavf-ts             | 2 +-
>> tests/ref/fate/ffprobe_compact                            | 4 ++--
>> tests/ref/fate/ffprobe_csv                                | 4 ++--
>> tests/ref/fate/ffprobe_default                            | 2 ++
>> tests/ref/fate/ffprobe_flat                               | 2 ++
>> tests/ref/fate/ffprobe_ini                                | 2 ++
>> tests/ref/fate/ffprobe_json                               | 2 ++
>> tests/ref/fate/ffprobe_xml                                | 4 ++--
>> tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 1 +
>> tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 1 +
>> tests/ref/fate/mov-zombie                                 | 2 +-
>> tests/ref/fate/mxf-probe-d10                              | 1 +
>> tests/ref/fate/mxf-probe-dnxhd                            | 1 +
>> tests/ref/fate/mxf-probe-dv25                             | 1 +
>> 20 files changed, 28 insertions(+), 12 deletions(-)
>> 
>> diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
>> index 97dc67def6..f88045232f 100644
>> --- a/doc/ffprobe.xsd
>> +++ b/doc/ffprobe.xsd
>> @@ -227,6 +227,7 @@
>>      <xsd:attribute name="coded_width"          type="xsd:int"/>
>>      <xsd:attribute name="coded_height"         type="xsd:int"/>
>>      <xsd:attribute name="has_b_frames"         type="xsd:int"/>
>> +      <xsd:attribute name="closed_captions"      type="xsd:int"/>
> 
> xsd:boolean seems more appropriate, no?

I was copying off has_b_frames above which I believed was also a 0/1. The output in the stream info is 0/1, not true/false.

>>      <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
>>      <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
>>      <xsd:attribute name="pix_fmt"              type="xsd:string"/>
>> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
>> index 840fcb71e2..f0916cbd70 100644
>> --- a/fftools/ffprobe.c
>> +++ b/fftools/ffprobe.c
>> @@ -2550,6 +2550,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
>>        }
>> #endif
>>        print_int("has_b_frames", par->video_delay);
>> +        print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS));
> 
> Not strictly related to this patch, but maybe these FF_CODEC_PROPERTY_* constants should be promoted to AV_*?

I’m not sure what is meant by this, but happy to do so if you can elaborate a bit more…?


>>        sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL);
>>        if (sar.num) {
>>            print_q("sample_aspect_ratio", sar, ':');
>> @@ -2950,6 +2951,7 @@ static int open_input_file(InputFile *ifile, const char *filename,
>> 
>>            ist->dec_ctx->pkt_timebase = stream->time_base;
>>            ist->dec_ctx->framerate = stream->avg_frame_rate;
>> +            ist->dec_ctx->properties = stream->codec->properties;
> 
> This is using the depreacted stream->codec, so I think this should go under the #IF below.
> 
>> #if FF_API_LAVF_AVCTX
>>            ist->dec_ctx->coded_width = stream->codec->coded_width;
>>            ist->dec_ctx->coded_height = stream->codec->coded_height;

OK, if this is the case, is there anything to worry to worry about if FF_API_LAVF_AVCTX is not defined? Should I be outputting closed_captions value in this case? Or am I thinking too much?
Marton Balint April 25, 2020, 4:29 p.m. UTC | #3
On Sat, 25 Apr 2020, vectronic wrote:

>
>
>> On 25 Apr 2020, at 09:08, Marton Balint <cus@passwd.hu> wrote:
>> 
>> 
>> 
>> On Fri, 24 Apr 2020, vectronic wrote:
>> 
>>> Signed-off-by: vectronic <hello.vectronic@gmail.com>
>>> ---
>>> doc/ffprobe.xsd                                           | 1 +
>>> fftools/ffprobe.c                                         | 2 ++
>>> tests/ref/fate/concat-demuxer-extended-lavf-mxf           | 2 +-
>>> tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10       | 2 +-
>>> tests/ref/fate/concat-demuxer-simple1-lavf-mxf            | 2 +-
>>> tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10        | 2 +-
>>> tests/ref/fate/concat-demuxer-simple2-lavf-ts             | 2 +-
>>> tests/ref/fate/ffprobe_compact                            | 4 ++--
>>> tests/ref/fate/ffprobe_csv                                | 4 ++--
>>> tests/ref/fate/ffprobe_default                            | 2 ++
>>> tests/ref/fate/ffprobe_flat                               | 2 ++
>>> tests/ref/fate/ffprobe_ini                                | 2 ++
>>> tests/ref/fate/ffprobe_json                               | 2 ++
>>> tests/ref/fate/ffprobe_xml                                | 4 ++--
>>> tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 1 +
>>> tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 1 +
>>> tests/ref/fate/mov-zombie                                 | 2 +-
>>> tests/ref/fate/mxf-probe-d10                              | 1 +
>>> tests/ref/fate/mxf-probe-dnxhd                            | 1 +
>>> tests/ref/fate/mxf-probe-dv25                             | 1 +
>>> 20 files changed, 28 insertions(+), 12 deletions(-)
>>> 
>>> diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
>>> index 97dc67def6..f88045232f 100644
>>> --- a/doc/ffprobe.xsd
>>> +++ b/doc/ffprobe.xsd
>>> @@ -227,6 +227,7 @@
>>>      <xsd:attribute name="coded_width"          type="xsd:int"/>
>>>      <xsd:attribute name="coded_height"         type="xsd:int"/>
>>>      <xsd:attribute name="has_b_frames"         type="xsd:int"/>
>>> +      <xsd:attribute name="closed_captions"      type="xsd:int"/>
>> 
>> xsd:boolean seems more appropriate, no?
>
> I was copying off has_b_frames above which I believed was also a 0/1. The output in the stream info is 0/1, not true/false.

xsd:boolean can be 0/1 according ot this:
https://www.w3schools.com/xml/schema_dtypes_misc.asp
And I think boolean is more appropriate.

>
>>>      <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
>>>      <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
>>>      <xsd:attribute name="pix_fmt"              type="xsd:string"/>
>>> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
>>> index 840fcb71e2..f0916cbd70 100644
>>> --- a/fftools/ffprobe.c
>>> +++ b/fftools/ffprobe.c
>>> @@ -2550,6 +2550,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
>>>        }
>>> #endif
>>>        print_int("has_b_frames", par->video_delay);
>>> +        print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS));
>> 
>> Not strictly related to this patch, but maybe these FF_CODEC_PROPERTY_* constants should be promoted to AV_*?
>
> I’m not sure what is meant by this, but happy to do so if you can elaborate a bit more…?

We typically use AV_ prefix for part-of-the-API constants and FF_ prefix 
for internal or not-part-of-the-API constants. Admittedly it is not very 
consistent, but I think that is the idea. Anyway, this can be changed 
later and in a separate patch.

>
>
>>>        sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL);
>>>        if (sar.num) {
>>>            print_q("sample_aspect_ratio", sar, ':');
>>> @@ -2950,6 +2951,7 @@ static int open_input_file(InputFile *ifile, const char *filename,
>>>
>>>            ist->dec_ctx->pkt_timebase = stream->time_base;
>>>            ist->dec_ctx->framerate = stream->avg_frame_rate;
>>> +            ist->dec_ctx->properties = stream->codec->properties;
>> 
>> This is using the depreacted stream->codec, so I think this should go under the #IF below.
>> 
>>> #if FF_API_LAVF_AVCTX
>>>            ist->dec_ctx->coded_width = stream->codec->coded_width;
>>>            ist->dec_ctx->coded_height = stream->codec->coded_height;
>
> OK, if this is the case, is there anything to worry to worry about if FF_API_LAVF_AVCTX is not defined? Should I be outputting closed_captions value in this case? Or am I thinking too much?

You are right, printing it should probably go to the block which prints 
the similar coded_height/coded_width values.

Regards,
Marton
diff mbox series

Patch

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 97dc67def6..f88045232f 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -227,6 +227,7 @@ 
       <xsd:attribute name="coded_width"          type="xsd:int"/>
       <xsd:attribute name="coded_height"         type="xsd:int"/>
       <xsd:attribute name="has_b_frames"         type="xsd:int"/>
+      <xsd:attribute name="closed_captions"      type="xsd:int"/>
       <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
       <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
       <xsd:attribute name="pix_fmt"              type="xsd:string"/>
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 840fcb71e2..f0916cbd70 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -2550,6 +2550,7 @@  static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
         }
 #endif
         print_int("has_b_frames", par->video_delay);
+        print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS));
         sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL);
         if (sar.num) {
             print_q("sample_aspect_ratio", sar, ':');
@@ -2950,6 +2951,7 @@  static int open_input_file(InputFile *ifile, const char *filename,
 
             ist->dec_ctx->pkt_timebase = stream->time_base;
             ist->dec_ctx->framerate = stream->avg_frame_rate;
+            ist->dec_ctx->properties = stream->codec->properties;
 #if FF_API_LAVF_AVCTX
             ist->dec_ctx->coded_width = stream->codec->coded_width;
             ist->dec_ctx->coded_height = stream->codec->coded_height;
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
index 2fb5fce4b1..da4ab35b59 100644
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
@@ -1 +1 @@ 
-a6fb9c37dc71cb43eb9664a8ae9f1c66 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
+47f9fbf6cc419c0b3301f4b16b15cdcc *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
index 60d729b3da..463c8d3b0b 100644
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
@@ -1 +1 @@ 
-cb7c8eac6f8917e39658e1fa4a250da8 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
+fe2e8c65ef7a8d4e11d09ddc26cb432a *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
index d18e35b7ba..6aa7f287cb 100644
--- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
@@ -120,5 +120,5 @@  audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|207872|K_|1
 Strings Metadata
 video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|212480|K_|1
 Strings Metadata
-0|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+0|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|0|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
index e83d1bf847..79ce1e2306 100644
--- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
@@ -78,5 +78,5 @@  video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1924096|K_|1
 Strings Metadata
 audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2074624|K_|1
 Strings Metadata
-0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
diff --git a/tests/ref/fate/concat-demuxer-simple2-lavf-ts b/tests/ref/fate/concat-demuxer-simple2-lavf-ts
index 0f03d6e06b..e5de697049 100644
--- a/tests/ref/fate/concat-demuxer-simple2-lavf-ts
+++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts
@@ -212,4 +212,4 @@  video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17440|206988|__MPE
 video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15019|224848|__MPEGTS Stream ID
 
 0|mp2|unknown|audio|1/44100|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0|0
-1|mpeg2video|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0|0
+1|mpeg2video|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|0|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0|0
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
index 4a0f4ee776..9ab7124501 100644
--- a/tests/ref/fate/ffprobe_compact
+++ b/tests/ref/fate/ffprobe_compact
@@ -27,6 +27,6 @@  frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.12
 packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1023544|flags=K_
 frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1023544|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
 stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le
-stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo
-stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:encoder=Lavc rawvideo
+stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|closed_captions=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo
+stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|closed_captions=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:encoder=Lavc rawvideo
 format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1053624|bit_rate=70241600|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv
index dfbeb40e20..7240d1ee6f 100644
--- a/tests/ref/fate/ffprobe_csv
+++ b/tests/ref/fate/ffprobe_csv
@@ -27,6 +27,6 @@  frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,793120,2
 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1023544,K_
 frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1023544,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
 stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le
-stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo
-stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo
+stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,320,240,0,0,1:1,4:3,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo
+stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,100,100,0,0,1:1,1:1,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo
 format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1053624,70241600,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
index 7562867e19..b63768c6fa 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -617,6 +617,7 @@  height=240
 coded_width=320
 coded_height=240
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1:1
 display_aspect_ratio=4:3
 pix_fmt=rgb24
@@ -672,6 +673,7 @@  height=100
 coded_width=100
 coded_height=100
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1:1
 display_aspect_ratio=1:1
 pix_fmt=rgb24
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
index fc82ee925d..a1ac957347 100644
--- a/tests/ref/fate/ffprobe_flat
+++ b/tests/ref/fate/ffprobe_flat
@@ -558,6 +558,7 @@  streams.stream.1.height=240
 streams.stream.1.coded_width=320
 streams.stream.1.coded_height=240
 streams.stream.1.has_b_frames=0
+streams.stream.1.closed_captions=0
 streams.stream.1.sample_aspect_ratio="1:1"
 streams.stream.1.display_aspect_ratio="4:3"
 streams.stream.1.pix_fmt="rgb24"
@@ -611,6 +612,7 @@  streams.stream.2.height=100
 streams.stream.2.coded_width=100
 streams.stream.2.coded_height=100
 streams.stream.2.has_b_frames=0
+streams.stream.2.closed_captions=0
 streams.stream.2.sample_aspect_ratio="1:1"
 streams.stream.2.display_aspect_ratio="1:1"
 streams.stream.2.pix_fmt="rgb24"
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
index a78690cc29..4772a8aa4c 100644
--- a/tests/ref/fate/ffprobe_ini
+++ b/tests/ref/fate/ffprobe_ini
@@ -623,6 +623,7 @@  height=240
 coded_width=320
 coded_height=240
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1\:1
 display_aspect_ratio=4\:3
 pix_fmt=rgb24
@@ -682,6 +683,7 @@  height=100
 coded_width=100
 coded_height=100
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1\:1
 display_aspect_ratio=1\:1
 pix_fmt=rgb24
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
index 4bb93d07e1..b9293a53ba 100644
--- a/tests/ref/fate/ffprobe_json
+++ b/tests/ref/fate/ffprobe_json
@@ -570,6 +570,7 @@ 
             "coded_width": 320,
             "coded_height": 240,
             "has_b_frames": 0,
+            "closed_captions": 0,
             "sample_aspect_ratio": "1:1",
             "display_aspect_ratio": "4:3",
             "pix_fmt": "rgb24",
@@ -614,6 +615,7 @@ 
             "coded_width": 100,
             "coded_height": 100,
             "has_b_frames": 0,
+            "closed_captions": 0,
             "sample_aspect_ratio": "1:1",
             "display_aspect_ratio": "1:1",
             "pix_fmt": "rgb24",
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
index d2c5ecdf73..1ab4a8ace9 100644
--- a/tests/ref/fate/ffprobe_xml
+++ b/tests/ref/fate/ffprobe_xml
@@ -37,13 +37,13 @@ 
             <tag key="E" value="mc²"/>
             <tag key="encoder" value="Lavc pcm_s16le"/>
         </stream>
-        <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" coded_width="320" coded_height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
+        <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" coded_width="320" coded_height="240" has_b_frames="0" closed_captions="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
             <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
             <tag key="title" value="foobar"/>
             <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
             <tag key="encoder" value="Lavc rawvideo"/>
         </stream>
-        <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" coded_width="100" coded_height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
+        <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" coded_width="100" coded_height="100" has_b_frames="0" closed_captions="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
             <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
             <tag key="encoder" value="Lavc rawvideo"/>
         </stream>
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
index eacb1f1910..31dd392ab4 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
@@ -27,6 +27,7 @@  height=71
 coded_width=128
 coded_height=72
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1:1
 display_aspect_ratio=127:71
 pix_fmt=gray
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
index ff96888f41..7712eea2cd 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
@@ -27,6 +27,7 @@  height=71
 coded_width=128
 coded_height=72
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1:1
 display_aspect_ratio=127:71
 pix_fmt=rgb0
diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
index f45fa59637..7644451085 100644
--- a/tests/ref/fate/mov-zombie
+++ b/tests/ref/fate/mov-zombie
@@ -129,5 +129,5 @@  packet|codec_type=video|stream_index=0|pts=188623|pts_time=2.095811|dts=188622|d
 frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2.095811|pkt_dts=188622|pkt_dts_time=2.095800|best_effort_timestamp=188623|best_effort_timestamp_time=2.095811|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=100846|pkt_size=974|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=64|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
 packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=580|pos=101820|flags=__
 frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
-stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_time_base=212521/12744000|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|timecode=N/A|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:encoder=H.264
+stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_time_base=212521/12744000|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|has_b_frames=1|closed_captions=0|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|timecode=N/A|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:encoder=H.264
 side_data|side_data_type=Display Matrix|displaymatrix=\n00000000:       131072           0           0\n00000001:            0       65536           0\n00000002:            0           0  1073741824\n|rotation=0
diff --git a/tests/ref/fate/mxf-probe-d10 b/tests/ref/fate/mxf-probe-d10
index 317d4ae4c5..6ab45688b6 100644
--- a/tests/ref/fate/mxf-probe-d10
+++ b/tests/ref/fate/mxf-probe-d10
@@ -11,6 +11,7 @@  height=608
 coded_width=0
 coded_height=0
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=152:135
 display_aspect_ratio=4:3
 pix_fmt=yuv422p
diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd
index 39968ad987..711a685c2c 100644
--- a/tests/ref/fate/mxf-probe-dnxhd
+++ b/tests/ref/fate/mxf-probe-dnxhd
@@ -119,6 +119,7 @@  height=480
 coded_width=640
 coded_height=480
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=1:1
 display_aspect_ratio=4:3
 pix_fmt=yuv422p
diff --git a/tests/ref/fate/mxf-probe-dv25 b/tests/ref/fate/mxf-probe-dv25
index 00028b08c5..88192159f8 100644
--- a/tests/ref/fate/mxf-probe-dv25
+++ b/tests/ref/fate/mxf-probe-dv25
@@ -11,6 +11,7 @@  height=576
 coded_width=720
 coded_height=576
 has_b_frames=0
+closed_captions=0
 sample_aspect_ratio=16:15
 display_aspect_ratio=4:3
 pix_fmt=yuv420p