mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'
* commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e': dnxhddec: Decode and use interlace mb flag Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
1342d7b2f9
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user