This fixes crashes when called from rtpdec_qt, where
AVFormatContext->pb is null, a crash present since
3bab7cd128.
Signed-off-by: Martin Storsjö <martin@martin.st>
break;
case MKBETAG('c','h','a','n'):
- if ((ret = ff_mov_read_chan(s, st, size)) < 0)
+ if ((ret = ff_mov_read_chan(s, s->pb, st, size)) < 0)
return ret;
break;
if (atom.size < 16)
return 0;
- ff_mov_read_chan(c->fc, st, atom.size - 4);
+ ff_mov_read_chan(c->fc, pb, st, atom.size - 4);
return 0;
}
return tag;
}
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
+int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
+ int64_t size)
{
- AVIOContext *pb = s->pb;
uint32_t layout_tag, bitmap, num_descr, label_mask;
int i;
* Read 'chan' tag from the input stream.
*
* @param s AVFormatContext
+ * @param pb AVIOContext
* @param st The stream to set codec values for
* @param size Remaining size in the 'chan' tag
* @return 0 if ok, or negative AVERROR code on failure
*/
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size);
+int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
+ int64_t size);
#endif /* AVFORMAT_MOV_CHAN_H */