repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavdevice
/
fbdev_common.c
diff --git
a/ffmpeg/libavdevice/fbdev_common.c
b/ffmpeg/libavdevice/fbdev_common.c
index 634780d58809eb717205ae946a0f18450b2cdafd..98f96de2af6bb4c5de282f4113a922be2455ee6a 100644
(file)
--- a/
ffmpeg/libavdevice/fbdev_common.c
+++ b/
ffmpeg/libavdevice/fbdev_common.c
@@
-84,8
+84,13
@@
int ff_fbdev_get_device_list(AVDeviceInfoList *device_list)
for (i = 0; i <= 31; i++) {
snprintf(device_file, sizeof(device_file), "/dev/fb%d", i);
for (i = 0; i <= 31; i++) {
snprintf(device_file, sizeof(device_file), "/dev/fb%d", i);
- if ((fd = avpriv_open(device_file, O_RDWR)) < 0)
+ if ((fd = avpriv_open(device_file, O_RDWR)) < 0) {
+ int err = AVERROR(errno);
+ if (err != AVERROR(ENOENT))
+ av_log(NULL, AV_LOG_ERROR, "Could not open framebuffer device '%s': %s\n",
+ device_file, av_err2str(err));
continue;
continue;
+ }
if (ioctl(fd, FBIOGET_VSCREENINFO, &varinfo) == -1)
goto fail_device;
if (ioctl(fd, FBIOGET_FSCREENINFO, &fixinfo) == -1)
if (ioctl(fd, FBIOGET_VSCREENINFO, &varinfo) == -1)
goto fail_device;
if (ioctl(fd, FBIOGET_FSCREENINFO, &fixinfo) == -1)
@@
-116,8
+121,8
@@
int ff_fbdev_get_device_list(AVDeviceInfoList *device_list)
fail_device:
if (device) {
fail_device:
if (device) {
- av_free
(
device->device_name);
- av_free
(
device->device_description);
+ av_free
p(&
device->device_name);
+ av_free
p(&
device->device_description);
av_freep(&device);
}
if (fd >= 0)
av_freep(&device);
}
if (fd >= 0)