Merge commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:44:10 +0000 (23:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:44:53 +0000 (23:44 +0200)
* commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa':
  nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nutdec.c

@@@ -543,17 -527,11 +550,19 @@@ static int decode_info_header(NUTContex
                  set_disposition_bits(s, str_value, stream_id_plus1 - 1);
                  continue;
              }
 +
 +            if (stream_id_plus1 && !strcmp(name, "r_frame_rate")) {
 +                sscanf(str_value, "%d/%d", &st->r_frame_rate.num, &st->r_frame_rate.den);
 +                if (st->r_frame_rate.num >= 1000LL*st->r_frame_rate.den)
 +                    st->r_frame_rate.num = st->r_frame_rate.den = 0;
 +                continue;
 +            }
 +
              if (metadata && av_strcasecmp(name, "Uses") &&
-                 av_strcasecmp(name, "Depends") && av_strcasecmp(name, "Replaces"))
+                 av_strcasecmp(name, "Depends") && av_strcasecmp(name, "Replaces")) {
+                 *event_flags |= metadata_flag;
                  av_dict_set(metadata, name, str_value, 0);
+             }
          }
      }