summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-05 23:54:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-06 02:21:36 +0200
commit5e24098b84424b4cf449d809d1027c49fb06c375 (patch)
treec1bd9585fd709d50b37fa62e9e130c373bd5f8e7
parent0fa8d19987f03444365a5c7f73b7ecf1520b011e (diff)
avidec: detect mpeg4 keyframes in indexless avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/avidec.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 27ae09aa73..98b3be6738 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1002,6 +1002,23 @@ resync:
e= &st->index_entries[index];
if(index >= 0 && e->timestamp == ast->frame_offset){
+ if (index == st->nb_index_entries-1){
+ int key=1;
+ int i;
+ uint32_t state=-1;
+ for(i=0; i<FFMIN(size,256); i++){
+ if(st->codec->codec_id == CODEC_ID_MPEG4){
+ if(state == 0x1B6){
+ key= !(pkt->data[i]&0xC0);
+ break;
+ }
+ }else
+ break;
+ state= (state<<8) + pkt->data[i];
+ }
+ if(!key)
+ e->flags &= ~AVINDEX_KEYFRAME;
+ }
if (e->flags & AVINDEX_KEYFRAME)
pkt->flags |= AV_PKT_FLAG_KEY;
}