summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-17 12:47:53 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-17 12:47:53 +0000
commit1ae406bfee47934bde76f95e0ebc0c1de099bcd3 (patch)
treee925591a129e0a829ff23e22e56f835c69c007de /src
parent5817595983c62f616fb31a6d3f297d47a9b20519 (diff)
downloadxine-lib-1ae406bfee47934bde76f95e0ebc0c1de099bcd3.tar.gz
xine-lib-1ae406bfee47934bde76f95e0ebc0c1de099bcd3.tar.bz2
Fix mpeg2 decoding with ffmpeg, thanks to Christer Palm (palm@nogui.se).
CVS patchset: 8046 CVS date: 2006/06/17 12:47:53
Diffstat (limited to 'src')
-rw-r--r--src/libffmpeg/libavcodec/mpegvideo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c
index 3ecf6d29d..77d6691af 100644
--- a/src/libffmpeg/libavcodec/mpegvideo.c
+++ b/src/libffmpeg/libavcodec/mpegvideo.c
@@ -239,6 +239,9 @@ void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){
const uint8_t *ff_find_start_code(const uint8_t * restrict p, const uint8_t *end, uint32_t * restrict state){
int i;
+ if(p>=end)
+ return end;
+
for(i=0; i<3; i++){
uint32_t tmp= *state << 8;
*state= tmp + *(p++);