diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:58:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:00:22 +0100 |
| commit | 85b424a45e3846bf48b8e53bc107bb4ead8216c6 (patch) | |
| tree | 6f2f60a51a0a8bad88acb91c0108ca077f1f23f2 /libavcodec/mlpdec.c | |
| parent | b4107f7805be6699d4b38449b1f9235958a2a133 (diff) | |
| parent | e92123093dfdca0ef6608998240e2f9345d63bff (diff) | |
| download | android_external_ffmpeg-85b424a45e3846bf48b8e53bc107bb4ead8216c6.tar.gz android_external_ffmpeg-85b424a45e3846bf48b8e53bc107bb4ead8216c6.tar.bz2 android_external_ffmpeg-85b424a45e3846bf48b8e53bc107bb4ead8216c6.zip | |
Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'
* commit 'e92123093dfdca0ef6608998240e2f9345d63bff':
mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 7bfd640b88..bf2507de5a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -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; |