OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4ef744
)
avcodec/mpeg4videodec: update bug workaround related variables like they where before
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 02:00:53 +0000
(
03:00
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 02:06:40 +0000
(
03:06
+0100)
This fixes the code after the variables have been moved into the
mpeg4 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg4videodec.c
b/libavcodec/mpeg4videodec.c
index
a1662f2
..
212954c
100644
(file)
--- a/
libavcodec/mpeg4videodec.c
+++ b/
libavcodec/mpeg4videodec.c
@@
-2684,6
+2684,10
@@
static int mpeg4_update_thread_context(AVCodecContext *dst,
s->time_increment_bits = s1->time_increment_bits;
s->vol_sprite_usage = s1->vol_sprite_usage;
s->rvlc = s1->rvlc;
+ s->divx_version = s1->divx_version;
+ s->divx_build = s1->divx_build;
+ s->xvid_build = s1->xvid_build;
+ s->lavc_build = s1->lavc_build;
return 0;
}