Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:49:38 +0000 (17:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:49:57 +0000 (17:49 +0200)
* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
  rmdec: do not export anything to AVCodecContext.codec_name

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

@@@ -254,9 -240,17 +254,7 @@@ static int rm_read_audio_stream_info(AV
                      return ret;
              }
              break;
-         default:
-             av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name));
          }
 -        if (ast->deint_id == DEINT_ID_INT4 ||
 -            ast->deint_id == DEINT_ID_GENR ||
 -            ast->deint_id == DEINT_ID_SIPR) {
 -            if (st->codec->block_align <= 0 ||
 -                ast->audio_framesize * sub_packet_h > (unsigned)INT_MAX ||
 -                ast->audio_framesize * sub_packet_h < st->codec->block_align)
 -                return AVERROR_INVALIDDATA;
 -            if (av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h) < 0)
 -                return AVERROR(ENOMEM);
 -        }
          switch (ast->deint_id) {
          case DEINT_ID_INT4:
              if (ast->coded_framesize > ast->audio_framesize ||