Skip to content
Snippets Groups Projects
Commit e2774b3e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'cehoyos/master'


* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1b99514d f99f7f40
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment