diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-14 10:26:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-14 10:26:56 +0200 |
| commit | d06dda65b499458761d23d9580fdcaa451ba96f5 (patch) | |
| tree | bfcbed6d5b9353d2941b6182f30ce6416f95d90e | |
| parent | f4392277b02e9cb991ef8ffc618c0019661a4573 (diff) | |
| parent | 139f352daf84e005824562e0e0f36e06ac60ee36 (diff) | |
| download | ffmpeg-d06dda65b499458761d23d9580fdcaa451ba96f5.tar.gz | |
Merge commit '139f352daf84e005824562e0e0f36e06ac60ee36' into release/0.10
* commit '139f352daf84e005824562e0e0f36e06ac60ee36':
wtv: Mark attachment with a negative stream id
avidec: Let the inner dv demuxer take care of discarding
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avidec.c | 9 | ||||
| -rw-r--r-- | libavformat/wtvdec.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7f64e9a36e..6fd69236ce 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -980,9 +980,12 @@ start_sync: } - if( (st->discard >= AVDISCARD_DEFAULT && size==0) - /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering - || st->discard >= AVDISCARD_ALL){ + if (!avi->dv_demux && + ((st->discard >= AVDISCARD_DEFAULT && size==0) /* || + //FIXME needs a little reordering + (st->discard >= AVDISCARD_NONKEY && + !(pkt->flags & AV_PKT_FLAG_KEY)) */ + || st->discard >= AVDISCARD_ALL)) { if (!exit_early) { ast->frame_offset += get_duration(ast, size); avio_skip(pb, size); diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 06050337fc..3980aca154 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -423,6 +423,7 @@ static void get_attachment(AVFormatContext *s, AVIOContext *pb, int length) st->codec->codec_id = CODEC_ID_MJPEG; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->extradata = av_mallocz(filesize); + st->id = -1; if (!st->codec->extradata) goto done; st->codec->extradata_size = filesize; |