diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-18 22:54:38 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-18 22:54:38 +0000 |
| commit | 591b240ed48641e3b72088c5b6e7b2e452b286ca (patch) | |
| tree | 23ffe7e2e0af04f4d6f30f0ac2bc1060fa1ef329 | |
| parent | 8d6b1ffba0ca32bbf3915d62fa34b7b61c6a50e3 (diff) | |
| download | ffmpeg-591b240ed48641e3b72088c5b6e7b2e452b286ca.tar.gz | |
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: Rostislav Pehlivanov <atomnuker@gmail.com>
| -rw-r--r-- | libavformat/oggparsedaala.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c index af6dce0a0d..dda8d70abd 100644 --- a/libavformat/oggparsedaala.c +++ b/libavformat/oggparsedaala.c @@ -42,6 +42,7 @@ static const struct DaalaPixFmtMap list_fmts[] = { typedef struct DaalaInfoHeader { int init_d; + int fpr; int gpshift; int gpmask; int version_maj; @@ -125,6 +126,9 @@ static int daala_header(AVFormatContext *s, int idx) hdr->gpmask = (1 << hdr->gpshift) - 1; hdr->format.depth = 8 + 2*(bytestream2_get_byte(&gb)-1); + + hdr->fpr = bytestream2_get_byte(&gb); + hdr->format.planes = bytestream2_get_byte(&gb); for (i = 0; i < hdr->format.planes; i++) { hdr->format.xdec[i] = bytestream2_get_byte(&gb); |