diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 22:19:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 22:19:46 +0200 |
| commit | e2774b3e3b51dfe312daa4504dbc5358fd9601b4 (patch) | |
| tree | bdc84c0520db21b8fbe3bdd5906fed9a686a36b5 /libavfilter/vf_super2xsai.c | |
| parent | 1b99514dfdc1d3fa60595b16d0e09c2b0b340ccb (diff) | |
| parent | f99f7f40257c53f93a9b65725e37459db54178f9 (diff) | |
| download | ffmpeg-e2774b3e3b51dfe312daa4504dbc5358fd9601b4.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_super2xsai.c')
0 files changed, 0 insertions, 0 deletions