ffmpeg | branch: master | Rostislav Pehlivanov <atomnu...@gmail.com> | Fri Dec 
18 22:54:38 2015 +0000| [591b240ed48641e3b72088c5b6e7b2e452b286ca] | committer: 
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: Rostislav Pehlivanov <atomnu...@gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=591b240ed48641e3b72088c5b6e7b2e452b286ca
---

 libavformat/oggparsedaala.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c
index af6dce0..dda8d70 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);

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to