[FFmpeg-devel] [PATCH 1/2] webp: fix capitalization of the word Exif
James Almer
jamrial at gmail.com
Tue Jan 14 07:11:31 CET 2014
Also remove "webp:" from log messages. Using the AVCodecContext is enough.
Signed-off-by: James Almer <jamrial at gmail.com>
---
Changelog | 2 +-
libavcodec/webp.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Changelog b/Changelog
index 342638e..a982b61 100644
--- a/Changelog
+++ b/Changelog
@@ -20,7 +20,7 @@ version <next>
- side & metadata support in NUT
- framepack filter
- XYZ12 rawvideo support in NUT
-- EXIF metadata in WebP
+- Exif metadata support in WebP decoder
version 2.1:
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index cc45cf8..89c8f13 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -32,7 +32,7 @@
* Compressed alpha for lossy
*
* @author James Almer <jamrial at gmail.com>
- * EXIF metadata
+ * Exif metadata
*
* Unimplemented:
* - Animation
@@ -1436,21 +1436,21 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
if (!(vp8x_flags & VP8X_FLAG_EXIF_METADATA))
av_log(avctx, AV_LOG_WARNING,
- "EXIF chunk present, but exif bit not set in the "
+ "EXIF chunk present, but Exif bit not set in the "
"VP8X header\n");
s->has_exif = 1;
bytestream2_init(&exif_gb, avpkt->data + exif_offset,
avpkt->size - exif_offset);
if (ff_tdecode_header(&exif_gb, &le, &ifd_offset) < 0) {
- av_log(avctx, AV_LOG_ERROR, "webp: invalid TIFF header "
- "in EXIF data\n");
+ av_log(avctx, AV_LOG_ERROR, "invalid TIFF header "
+ "in Exif data\n");
goto exif_end;
}
bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET);
if (ff_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) {
- av_log(avctx, AV_LOG_ERROR, "webp: error decoding EXIF data\n");
+ av_log(avctx, AV_LOG_ERROR, "error decoding Exif data\n");
goto exif_end;
}
--
1.8.3.2
More information about the ffmpeg-devel
mailing list