Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'

* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
  adts: Return more meaningful error codes

Conflicts:
	libavformat/adtsenc.c

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

diff --cc libavformat/adtsenc.c
index 9ec11811771ca933440001654d4adb74477d2562,5194e75a5fbcda64a38a9dae80661a98b26edae6..d624b796075a68713559897c7e92ff4299d37b05
--- 1/libavformat/adtsenc.c
--- 2/libavformat/adtsenc.c
+++ b/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;
  }