OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f5c368
)
avformat/utils: dont count attached pics toward the probesize
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 18 Nov 2013 02:02:36 +0000
(
03:02
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 18 Nov 2013 02:02:36 +0000
(
03:02
+0100)
Such pics behave more like headers which we also dont count.
Fixes Ticket3146
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
8c497d6
..
9522909
100644
(file)
--- a/
libavformat/utils.c
+++ b/
libavformat/utils.c
@@
-2846,9
+2846,10
@@
int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
goto find_stream_info_err;
}
- read_size += pkt->size;
-
st = ic->streams[pkt->stream_index];
+ if (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC))
+ read_size += pkt->size;
+
if (pkt->dts != AV_NOPTS_VALUE && st->codec_info_nb_frames > 1) {
/* check for non-increasing dts */
if (st->info->fps_last_dts != AV_NOPTS_VALUE &&