Merge commit '95ce02b35d3d1bb16111031df1d82a6e4d894d36'
authorJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 22:15:16 +0000 (19:15 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 22:17:26 +0000 (19:17 -0300)
* commit '95ce02b35d3d1bb16111031df1d82a6e4d894d36':
  rmdec: don't ignore the return value of av_get_packet()

See 65b83ce01b94eae944290c11257799a9288f2d4c

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/rmdec.c

@@@ -954,10 -784,10 +955,11 @@@ ff_rm_parse_packet (AVFormatContext *s
                  return ret;
              rm_ac3_swap_bytes(st, pkt);
          }
 -    } else
 +    } else {
-         if ((ret = av_get_packet(pb, pkt, len)) < 0)
+         ret = av_get_packet(pb, pkt, len);
+         if (ret < 0)
              return ret;
 +    }
  
      pkt->stream_index = st->index;
  
@@@ -973,16 -803,18 +975,17 @@@ ff_rm_retrieve_cache (AVFormatContext *
                        AVStream *st, RMStream *ast, AVPacket *pkt)
  {
      RMDemuxContext *rm = s->priv_data;
+     int ret;
  
 -    assert (rm->audio_pkt_cnt > 0);
 +    av_assert0 (rm->audio_pkt_cnt > 0);
  
      if (ast->deint_id == DEINT_ID_VBRF ||
          ast->deint_id == DEINT_ID_VBRS) {
-         int ret = av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
+         ret = av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
          if (ret < 0)
              return ret;
 -    }
 -    else {
 +    } else {
-         int ret = av_new_packet(pkt, st->codecpar->block_align);
+         ret = av_new_packet(pkt, st->codecpar->block_align);
          if (ret < 0)
              return ret;
          memcpy(pkt->data, ast->pkt.data + st->codecpar->block_align * //FIXME avoid this