Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:50:38 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:50:38 +0000 (12:50 +0100)
* commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427':
  dashenc: Add options to make segment names configurable

Conflicts:
libavformat/dashenc.c

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

@@@ -439,12 -569,10 +569,12 @@@ static int dash_write_header(AVFormatCo
          AVDictionary *opts = NULL;
          char filename[1024];
  
-         int bit_rate = s->streams[i]->codec->bit_rate ?
 -        os->bit_rate = s->streams[i]->codec->bit_rate;
++        os->bit_rate = s->streams[i]->codec->bit_rate ?
 +                       s->streams[i]->codec->bit_rate :
 +                       s->streams[i]->codec->rc_max_rate;
-         if (bit_rate) {
+         if (os->bit_rate) {
              snprintf(os->bandwidth_str, sizeof(os->bandwidth_str),
-                      " bandwidth=\"%d\"", bit_rate);
+                      " bandwidth=\"%d\"", os->bit_rate);
          } else {
              int level = s->strict_std_compliance >= FF_COMPLIANCE_STRICT ?
                          AV_LOG_ERROR : AV_LOG_WARNING;