diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:24:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:24:35 +0100 |
| commit | ee648903f5e65b6f17f12326d2c50310a993be87 (patch) | |
| tree | c6cdb5818bb46eb76d58c593a3ff5e351052ae03 /libavcodec/mjpegdec.c | |
| parent | b3818c47d8ba3cdae5e924afde797123352ce2a5 (diff) | |
| parent | 7a5356c7281d39ee168bfa984ae081969e47da27 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions