mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-27 15:09:18 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: ARM: remove MULL inline asm mathops: use MUL64 macro where it forms part of other ops tty: factorise returning error codes. rawdec: add framerate private option. x11grab: add framerate private option. fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. bktr: don't error when AVFormatParameters.time_base isn't set. cmdutils: add missing const qualifier Skip headers not designed to work standalone during 'make checkheaders'. Add missing #includes to make headers self-contained. musepack: remove unnecessary #include from mpcdata.h musepack: remove extraneous mpcdata.h inclusions Fix error check in av_file_map() Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
46eb300d01
20 changed files with 270 additions and 340 deletions
|
@ -169,7 +169,7 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
|
|||
st->codec->width = fbdev->width;
|
||||
st->codec->height = fbdev->heigth;
|
||||
st->codec->pix_fmt = pix_fmt;
|
||||
st->codec->time_base = ap->time_base;
|
||||
st->codec->time_base = (AVRational){fbdev->fps.den, fbdev->fps.num};
|
||||
st->codec->bit_rate =
|
||||
fbdev->width * fbdev->heigth * fbdev->bytes_per_pixel * av_q2d(fbdev->fps) * 8;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue