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:
d5ad4e4
)
avcodec/tiff: factorize offset init code
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 27 Oct 2013 12:10:06 +0000
(13:10 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 27 Oct 2013 12:10:38 +0000
(13:10 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiff.c
patch
|
blob
|
history
diff --git
a/libavcodec/tiff.c
b/libavcodec/tiff.c
index
e8c9950
..
2b100ed
100644
(file)
--- a/
libavcodec/tiff.c
+++ b/
libavcodec/tiff.c
@@
-578,6
+578,7
@@
static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
goto end;
}
+ off = bytestream2_tell(&s->gb);
if (count == 1) {
switch (type) {
case TIFF_BYTE:
@@
-590,11
+591,8
@@
static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
break;
}
default:
- off = bytestream2_tell(&s->gb);
value = UINT_MAX;
}
- } else {
- off = bytestream2_tell(&s->gb);
}
switch (tag) {