diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-09-20 22:52:04 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-09-20 22:52:04 +0000 |
| commit | d07b74f7272f2e8964a32448b9b5983d851dca16 (patch) | |
| tree | b9a25216feb40b9e840b85a7b273c6c5e284767d | |
| parent | 7698fe288404eefa383d1e13a1fb587886a4bed4 (diff) | |
| download | xine-lib-d07b74f7272f2e8964a32448b9b5983d851dca16.tar.gz xine-lib-d07b74f7272f2e8964a32448b9b5983d851dca16.tar.bz2 | |
Do never memcpy the buffer if the stream is mpeg1/2.
See why it's not needed in mpeg_parser.c
This fixes mpeg-es playback, especially xine-ui logo playback ! ;)
CVS patchset: 6984
CVS date: 2004/09/20 22:52:04
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index aa165a172..e4e279bd4 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.32 2004/09/14 22:13:44 jstembridge Exp $ + * $Id: video_decoder.c,v 1.33 2004/09/20 22:52:04 tmattern Exp $ * * xine video decoder plugin using ffmpeg * @@ -843,9 +843,9 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { return; /* do not send special data to the decoder */ } } else { - if ((((this->size == 0) && (buf->decoder_flags & BUF_FLAG_FRAME_END)) || - (this->is_mpeg12)) && - ((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size)) { + if (((this->size == 0) && (buf->decoder_flags & BUF_FLAG_FRAME_END) && + ((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size)) || + (this->is_mpeg12)) { /* buf contains a full frame */ /* no memcpy needed */ ffbuf = buf->content; |