diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:48:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 11:48:05 +0200 |
| commit | b9d55a07f3cd0dc3013d47d819c4102bd64111b1 (patch) | |
| tree | 05132c89a1c79ec016868b6126c81cf140d76869 /libavformat | |
| parent | b7ce510003275460a9b02361a8c98bfec6fa2945 (diff) | |
| parent | f5e646a00ac21e500dae4bcceded790a0fbc5246 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Mark attachment with a negative stream id
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/wtvdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 6427dd1049..62ea908f9f 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -436,6 +436,7 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length) av_dict_set(&st->metadata, "title", description, 0); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_MJPEG; + st->id = -1; ret = av_get_packet(pb, &st->attached_pic, filesize); if (ret < 0) goto done; |