diff options
| author | Reinhard Nißl <rnissl@gmx.de> | 2007-10-08 00:07:30 +0200 |
|---|---|---|
| committer | Reinhard Nißl <rnissl@gmx.de> | 2007-10-08 00:07:30 +0200 |
| commit | 5597fd7b64520c7426ef824eb8235bb81243cb24 (patch) | |
| tree | 41a0ba82c52a05c0911986c4eed104e6573553d4 | |
| parent | dae5ddb5d509c254e77232cd9e0300ec67d039f9 (diff) | |
| download | xine-lib-5597fd7b64520c7426ef824eb8235bb81243cb24.tar.gz xine-lib-5597fd7b64520c7426ef824eb8235bb81243cb24.tar.bz2 | |
Revert cheating invalid frame sizes after fixed frame allocation (continued).
These cheats where hiding a frame allocation bug in FFmpeg decoder
which was previously fixed.
| -rw-r--r-- | src/video_out/video_out_xcbshm.c | 5 | ||||
| -rw-r--r-- | src/video_out/video_out_xcbxv.c | 5 | ||||
| -rw-r--r-- | src/video_out/video_out_xshm.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 1491832ea..bc31e153a 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -133,11 +133,6 @@ typedef struct { */ static void create_ximage(xshm_driver_t *this, xshm_frame_t *frame, int width, int height) { - if (width <= 0) - width = 1; - if (height <= 0) - height = 1; - frame->bytes_per_line = ((this->bpp * width + this->scanline_pad - 1) & (~(this->scanline_pad - 1))) >> 3; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 4cb57156d..84185bb85 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -208,11 +208,6 @@ static void create_ximage(xv_driver_t *this, xv_frame_t *frame, int width, int h unsigned int length; - if (width <= 0) - width = 1; - if (height <= 0) - height = 1; - if (this->use_pitch_alignment) { width = (width + 7) & ~0x7; } diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 79ab41e00..54747e1a9 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -175,11 +175,6 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo, int width, int height) { XImage *myimage = NULL; - if (width <= 0) - width = 1; - if (height <= 0) - height = 1; - if (this->use_shm) { /* |