Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)
* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
  adts: Return more meaningful error codes

Conflicts:
libavformat/adtsenc.c

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

@@@ -99,11 -93,9 +99,11 @@@ static int adts_write_header(AVFormatCo
      ADTSContext *adts = s->priv_data;
      AVCodecContext *avc = s->streams[0]->codec;
  
-     if (avc->extradata_size > 0 &&
-             adts_decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0)
-         return -1;
 +    if (adts->id3v2tag)
 +        ff_id3v2_write_simple(s, 4, ID3v2_DEFAULT_MAGIC);
+     if (avc->extradata_size > 0)
+         return adts_decode_extradata(s, adts, avc->extradata,
+                                      avc->extradata_size);
  
      return 0;
  }