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 | f43e6be30fcd0879cb5d1d43e73254950ef6a68c (patch) | |
| tree | 60ca7f16062e1a3375bdae3c838f2b6a0a4b8d68 | |
| parent | a36843adb6fd20a26b2081562d7c7f2addcc5131 (diff) | |
| download | xine-lib-f43e6be30fcd0879cb5d1d43e73254950ef6a68c.tar.gz xine-lib-f43e6be30fcd0879cb5d1d43e73254950ef6a68c.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.
(transplanted from c7cc5ff1e184791683ba13bdc54c53b5887e6587)
--HG--
extra : transplant_source : %C7%CC_%F1%E1%84y%16%83%BA%13%BD%C5LS%B5%88%7Ee%87
| -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 c9b83bb24..2ac579555 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -131,11 +131,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 eef61e4ea..18ab5c6fb 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -211,11 +211,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 932f22e3a..9e901821a 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -172,11 +172,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) { /* |