diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 02:33:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 03:00:31 +0200 |
| commit | 46eb300d016b69b5fedb0410df98e3c698090c8c (patch) | |
| tree | 7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b /libavdevice/fbdev.c | |
| parent | 124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 (diff) | |
| parent | 594fbe42c6b21aef76b938ce97524fa92a48e7a0 (diff) | |
| download | ffmpeg-46eb300d016b69b5fedb0410df98e3c698090c8c.tar.gz | |
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>
Diffstat (limited to 'libavdevice/fbdev.c')
| -rw-r--r-- | libavdevice/fbdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 0d41b5d6ba..dadcd70015 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -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; |