Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 20:19:33 +0000 (22:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 20:19:46 +0000 (22:19 +0200)
* 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: Michael Niedermayer <michaelni@gmx.at>

Trivial merge