Commit 591b240e authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov

oggparsedaala: sync with current bitstream syntax

Since the parser was merged back almost 2 months ago this is the first
time the bitstream of the container has been updated.
Signed-off-by: 's avatarRostislav Pehlivanov <atomnuker@gmail.com>
parent 8d6b1ffb
...@@ -42,6 +42,7 @@ static const struct DaalaPixFmtMap list_fmts[] = { ...@@ -42,6 +42,7 @@ static const struct DaalaPixFmtMap list_fmts[] = {
typedef struct DaalaInfoHeader { typedef struct DaalaInfoHeader {
int init_d; int init_d;
int fpr;
int gpshift; int gpshift;
int gpmask; int gpmask;
int version_maj; int version_maj;
...@@ -125,6 +126,9 @@ static int daala_header(AVFormatContext *s, int idx) ...@@ -125,6 +126,9 @@ static int daala_header(AVFormatContext *s, int idx)
hdr->gpmask = (1 << hdr->gpshift) - 1; hdr->gpmask = (1 << hdr->gpshift) - 1;
hdr->format.depth = 8 + 2*(bytestream2_get_byte(&gb)-1); hdr->format.depth = 8 + 2*(bytestream2_get_byte(&gb)-1);
hdr->fpr = bytestream2_get_byte(&gb);
hdr->format.planes = bytestream2_get_byte(&gb); hdr->format.planes = bytestream2_get_byte(&gb);
for (i = 0; i < hdr->format.planes; i++) { for (i = 0; i < hdr->format.planes; i++) {
hdr->format.xdec[i] = bytestream2_get_byte(&gb); hdr->format.xdec[i] = bytestream2_get_byte(&gb);
......
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