git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3469cfa
)
avcodec/iff: Add "else" to make code look prettier
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 13 Jul 2019 17:43:13 +0000
(19:43 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 14 Jul 2019 20:17:43 +0000
(22:17 +0200)
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/iff.c
patch
|
blob
|
history
diff --git
a/libavcodec/iff.c
b/libavcodec/iff.c
index
c6e2359
..
7f1c589
100644
(file)
--- a/
libavcodec/iff.c
+++ b/
libavcodec/iff.c
@@
-284,7
+284,7
@@
static int extract_header(AVCodecContext *const avctx,
if (s->bpp > 8) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u\n", s->ham);
return AVERROR_INVALIDDATA;
- } if (s->ham != (s->bpp > 6 ? 6 : 4)) {
+ }
else
if (s->ham != (s->bpp > 6 ? 6 : 4)) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u, BPP: %u\n", s->ham, s->bpp);
return AVERROR_INVALIDDATA;
}