eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

wtvdec: demux thumbnail picture to AVStream.attached_pic

Browse Source 
Fixes ticket #2133.

(cherry picked from commit 508836932f)
This commit is contained in:
Peter Ross
2013-01-06 14:15:24 +11:00
committed by Carl Eugen Hoyos
parent d807022283
commit 4f8b7eb87f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/wtvdec.c
View File

@@ -413,6 +413,7 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)
char description[1024]; char description[1024];
unsigned int filesize; unsigned int filesize;
AVStream *st; AVStream *st;
int ret;
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
avio_get_str16le(pb, INT_MAX, mime, sizeof(mime)); avio_get_str16le(pb, INT_MAX, mime, sizeof(mime));
@@ -429,13 +430,14 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length)
if (!st) if (!st)
goto done; goto done;
av_dict_set(&st->metadata, "title", description, 0); av_dict_set(&st->metadata, "title", description, 0);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = AV_CODEC_ID_MJPEG; st->codec->codec_id = AV_CODEC_ID_MJPEG;
st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; ret = av_get_packet(pb, &st->attached_pic, filesize);
st->codec->extradata = av_mallocz(filesize); if (ret < 0)
if (!st->codec->extradata)
goto done; goto done;
st->codec->extradata_size = filesize; st->attached_pic.stream_index = st->index;
avio_read(pb, st->codec->extradata, filesize); st->attached_pic.flags |= AV_PKT_FLAG_KEY;
st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
done: done:
avio_seek(pb, pos + length, SEEK_SET); avio_seek(pb, pos + length, SEEK_SET);
} }