Commit 31adc12a authored by kostya's avatar kostya

Take ring frame into account when demuxing.

This fixes issue 97.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10192 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 8890318e
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "bswap.h" #include "bswap.h"
#define SMACKER_PAL 0x01 #define SMACKER_PAL 0x01
#define SMACKER_FLAG_RING_FRAME 0x01
enum SAudFlags { enum SAudFlags {
SMK_AUD_PACKED = 0x80000000, SMK_AUD_PACKED = 0x80000000,
...@@ -112,6 +113,8 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -112,6 +113,8 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap)
smk->frames = get_le32(pb); smk->frames = get_le32(pb);
smk->pts_inc = (int32_t)get_le32(pb); smk->pts_inc = (int32_t)get_le32(pb);
smk->flags = get_le32(pb); smk->flags = get_le32(pb);
if(smk->flags & SMACKER_FLAG_RING_FRAME)
smk->frames++;
for(i = 0; i < 7; i++) for(i = 0; i < 7; i++)
smk->audio[i] = get_le32(pb); smk->audio[i] = get_le32(pb);
smk->treesize = get_le32(pb); smk->treesize = get_le32(pb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment