diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:21:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:21:01 +0200 |
| commit | 27ccc82e1bb1b97a85e5fb33b92082267078b4d1 (patch) | |
| tree | 6dbdea647635c92e397cf37407540070453340c5 /libavdevice | |
| parent | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (diff) | |
| parent | 22c8cbc0da8be2ba80190d42d381f63da389734f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu,lavd: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavutil/imgutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -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 386ee72b68..30595bd0fe 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -171,7 +171,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) av_log(avctx, AV_LOG_INFO, "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n", fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel, - av_pix_fmt_descriptors[pix_fmt].name, + av_get_pix_fmt_name(pix_fmt), fbdev->framerate_q.num, fbdev->framerate_q.den, st->codec->bit_rate); return 0; |