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
/
libavcodec
/
mpegvideo.c
diff --git
a/ffmpeg/libavcodec/mpegvideo.c
b/ffmpeg/libavcodec/mpegvideo.c
index f043bbdacef384ffd950feb6f19cc86e442362b5..f84557b4d39d00aab4e8dd657c6a8109c4203654 100644
(file)
--- a/
ffmpeg/libavcodec/mpegvideo.c
+++ b/
ffmpeg/libavcodec/mpegvideo.c
@@
-956,6
+956,7
@@
int ff_mpeg_update_thread_context(AVCodecContext *dst,
// FIXME can parameters change on I-frames?
// in that case dst may need a reinit
if (!s->context_initialized) {
// FIXME can parameters change on I-frames?
// in that case dst may need a reinit
if (!s->context_initialized) {
+ int err;
memcpy(s, s1, sizeof(MpegEncContext));
s->avctx = dst;
memcpy(s, s1, sizeof(MpegEncContext));
s->avctx = dst;
@@
-966,10
+967,10
@@
int ff_mpeg_update_thread_context(AVCodecContext *dst,
// s->picture_range_start += MAX_PICTURE_COUNT;
// s->picture_range_end += MAX_PICTURE_COUNT;
ff_mpv_idct_init(s);
// s->picture_range_start += MAX_PICTURE_COUNT;
// s->picture_range_end += MAX_PICTURE_COUNT;
ff_mpv_idct_init(s);
- if((
ret
= ff_mpv_common_init(s)) < 0){
+ if((
err
= ff_mpv_common_init(s)) < 0){
memset(s, 0, sizeof(MpegEncContext));
s->avctx = dst;
memset(s, 0, sizeof(MpegEncContext));
s->avctx = dst;
- return
ret
;
+ return
err
;
}
}
}
}
}
}