RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff' 

* commit 'e92123093dfdca0ef6608998240e2f9345d63bff':
  mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-05 22:58:49 +01:00
parent b4107f7805 e92123093d
commit 85b424a45e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mlpdec.c
View File

@ -1098,6 +1098,10 @@ static int output_data(MLPDecodeContext *m, unsigned int substr,
}
}
/* Update matrix encoding side data */
if ((ret = ff_side_data_update_matrix_encoding(frame, s->matrix_encoding)) < 0)
return ret;
*got_frame_ptr = 1;
return 0;