Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:35:29 +0000 (10:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:35:29 +0000 (10:35 +0100)
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
  oggparsetheora: return meaningful error codes

Conflicts:
libavformat/oggparsetheora.c

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

@@@ -117,11 -117,10 +117,11 @@@ static int theora_header(AVFormatContex
          ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7);
      case 0x82:
          if (!thp->version)
-             return -1;
+             return AVERROR_INVALIDDATA;
          break;
      default:
-         return -1;
 +        av_log(s, AV_LOG_ERROR, "Unknown header type %X\n", os->buf[os->pstart]);
+         return AVERROR_INVALIDDATA;
      }
  
      if ((err = av_reallocp(&st->codec->extradata,