virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mov: fix demuxing of eia-608

Browse Source 
Fixes #4616.
This commit is contained in:
Paul B Mahol
2020-06-14 14:19:56 +02:00
parent cb98483ea0
commit f91906973c
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/mov.c
View File

@@ -7858,6 +7858,27 @@ static int mov_change_extradata(MOVStreamContext *sc, AVPacket *pkt)
return 0; return 0;
} }
static int get_eia608_packet(AVIOContext *pb, AVPacket *pkt, int size)
{
int new_size, ret;
if (size <= 8)
return AVERROR_INVALIDDATA;
new_size = ((size - 8) / 2) * 3;
ret = av_new_packet(pkt, new_size);
if (ret < 0)
return ret;
avio_skip(pb, 8);
for (int j = 0; j < new_size; j += 3) {
pkt->data[j] = 0xFC;
pkt->data[j+1] = avio_r8(pb);
pkt->data[j+2] = avio_r8(pb);
}
return 0;
}
static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
@@ -7902,6 +7923,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
goto retry; goto retry;
} }
if (st->codecpar->codec_id == AV_CODEC_ID_EIA_608 && sample->size > 8)
ret = get_eia608_packet(sc->pb, pkt, sample->size);
else
ret = av_get_packet(sc->pb, pkt, sample->size); ret = av_get_packet(sc->pb, pkt, sample->size);
if (ret < 0) { if (ret < 0) {
if (should_retry(sc->pb, ret)) { if (should_retry(sc->pb, ret)) {