Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:25:50 +0000 (17:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:26:06 +0000 (17:26 +0200)
* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0':
  oggparseskeleton: do not use AVCodecContext.codec_name

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

@@@ -34,12 -34,8 +34,11 @@@ static int skeleton_header(AVFormatCont
      uint64_t start_granule;
      int target_idx, start_time;
  
-     strcpy(st->codec->codec_name, "skeleton");
      st->codec->codec_type = AVMEDIA_TYPE_DATA;
  
 +    if ((os->flags & OGG_FLAG_EOS) && os->psize == 0)
 +        return 1;
 +
      if (os->psize < 8)
          return -1;