diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-06 12:10:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-08 07:13:26 +0200 |
| commit | 716d413c13981da15323c7a3821860536eefdbbb (patch) | |
| tree | b15ebcded50b8edaa5b9fc8f261774043138e1fa /libavdevice/fbdev.c | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
| download | ffmpeg-716d413c13981da15323c7a3821860536eefdbbb.tar.gz | |
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Diffstat (limited to 'libavdevice/fbdev.c')
| -rw-r--r-- | libavdevice/fbdev.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 376d104e07..fffe655ab5 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -48,20 +48,20 @@ struct rgb_pixfmt_map_entry { int bits_per_pixel; int red_offset, green_offset, blue_offset, alpha_offset; - enum PixelFormat pixfmt; + enum AVPixelFormat pixfmt; }; static struct rgb_pixfmt_map_entry rgb_pixfmt_map[] = { // bpp, red_offset, green_offset, blue_offset, alpha_offset, pixfmt - { 32, 0, 8, 16, 24, PIX_FMT_RGBA }, - { 32, 16, 8, 0, 24, PIX_FMT_BGRA }, - { 32, 8, 16, 24, 0, PIX_FMT_ARGB }, - { 32, 3, 2, 8, 0, PIX_FMT_ABGR }, - { 24, 0, 8, 16, 0, PIX_FMT_RGB24 }, - { 24, 16, 8, 0, 0, PIX_FMT_BGR24 }, + { 32, 0, 8, 16, 24, AV_PIX_FMT_RGBA }, + { 32, 16, 8, 0, 24, AV_PIX_FMT_BGRA }, + { 32, 8, 16, 24, 0, AV_PIX_FMT_ARGB }, + { 32, 3, 2, 8, 0, AV_PIX_FMT_ABGR }, + { 24, 0, 8, 16, 0, AV_PIX_FMT_RGB24 }, + { 24, 16, 8, 0, 0, AV_PIX_FMT_BGR24 }, }; -static enum PixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo) +static enum AVPixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo) { int i; @@ -74,7 +74,7 @@ static enum PixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *var return entry->pixfmt; } - return PIX_FMT_NONE; + return AV_PIX_FMT_NONE; } typedef struct { @@ -99,7 +99,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; AVStream *st = NULL; - enum PixelFormat pix_fmt; + enum AVPixelFormat pix_fmt; int ret, flags = O_RDONLY; ret = av_parse_video_rate(&fbdev->framerate_q, fbdev->framerate); @@ -139,7 +139,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) } pix_fmt = get_pixfmt_from_fb_varinfo(&fbdev->varinfo); - if (pix_fmt == PIX_FMT_NONE) { + if (pix_fmt == AV_PIX_FMT_NONE) { ret = AVERROR(EINVAL); av_log(avctx, AV_LOG_ERROR, "Framebuffer pixel format not supported.\n"); |