diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:36:06 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:36:06 +0200 |
| commit | 1342d7b2f9413c7f3fa6e51795922f57d1ed70c6 (patch) | |
| tree | d19034eed01200c2f7a4e0c7d7495c7ac5dee990 /libavcodec | |
| parent | b3bf41cb75d434b2622433a96dcb617a58e9fca6 (diff) | |
| parent | c49cbecbae5a42f4ca004197b0118cc50aaaca2e (diff) | |
| download | ffmpeg-1342d7b2f9413c7f3fa6e51795922f57d1ed70c6.tar.gz | |
Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'
* commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e':
dnxhddec: Decode and use interlace mb flag
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dnxhddec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 423bce2252..e3dec78f7f 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -401,8 +401,9 @@ static int dnxhd_decode_macroblock(const DNXHDContext *ctx, RowContext *row, if (ctx->mbaff) { interlaced_mb = get_bits1(&row->gb); qscale = get_bits(&row->gb, 10); - } else + } else { qscale = get_bits(&row->gb, 11); + } act = get_bits1(&row->gb); if (act) { static int warned = 0; |