diff options
| author | James Almer <jamrial@gmail.com> | 2014-01-14 03:11:31 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 02:54:36 +0100 |
| commit | 8bfa5f7fab3dfc6ca163b74499ef8ab09a1cfea6 (patch) | |
| tree | 397ded7f0e85e93daf1d532d0f958ebe3e88253f | |
| parent | 785dc146544affcc6a5d01db0469535811530a65 (diff) | |
| download | ffmpeg-8bfa5f7fab3dfc6ca163b74499ef8ab09a1cfea6.tar.gz | |
webp: fix capitalization of the word Exif
Also remove "webp:" from log messages. Using the AVCodecContext is enough.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavcodec/webp.c | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -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 cc45cf87fd..89c8f13176 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -32,7 +32,7 @@ * Compressed alpha for lossy * * @author James Almer <jamrial@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; } |