Commit 6e610f94 authored by bcoudurier's avatar bcoudurier

support AVDISCARD_ALL

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12350 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent dc22d0b8
...@@ -353,6 +353,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -353,6 +353,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
url_fskip(s->pb, klv.length); url_fskip(s->pb, klv.length);
return -1; return -1;
} }
if (s->streams[index]->discard == AVDISCARD_ALL)
goto skip;
/* check for 8 channels AES3 element */ /* check for 8 channels AES3 element */
if (klv.key[12] == 0x06 && klv.key[13] == 0x01 && klv.key[14] == 0x10) { if (klv.key[12] == 0x06 && klv.key[13] == 0x01 && klv.key[14] == 0x10) {
if (mxf_get_d10_aes3_packet(s->pb, s->streams[index], pkt, klv.length) < 0) { if (mxf_get_d10_aes3_packet(s->pb, s->streams[index], pkt, klv.length) < 0) {
...@@ -365,6 +367,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -365,6 +367,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos = klv.offset; pkt->pos = klv.offset;
return 0; return 0;
} else } else
skip:
url_fskip(s->pb, klv.length); url_fskip(s->pb, klv.length);
} }
return AVERROR(EIO); return AVERROR(EIO);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment