RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Almer 2014-01-14 03:11:31 -03:00 committed by Michael Niedermayer
parent 785dc14654
commit 8bfa5f7fab
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -20,7 +20,7 @@ version <next>
- side & metadata support in NUT - side & metadata support in NUT
- framepack filter - framepack filter
- XYZ12 rawvideo support in NUT - XYZ12 rawvideo support in NUT
- EXIF metadata in WebP - Exif metadata support in WebP decoder
version 2.1: version 2.1:

10
libavcodec/webp.c
View File

@ -32,7 +32,7 @@
* Compressed alpha for lossy * Compressed alpha for lossy
* *
* @author James Almer <jamrial@gmail.com> * @author James Almer <jamrial@gmail.com>
* EXIF metadata * Exif metadata
* *
* Unimplemented: * Unimplemented:
* - Animation * - Animation
@ -1436,21 +1436,21 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} }
if (!(vp8x_flags & VP8X_FLAG_EXIF_METADATA)) if (!(vp8x_flags & VP8X_FLAG_EXIF_METADATA))
av_log(avctx, AV_LOG_WARNING, 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"); "VP8X header\n");
s->has_exif = 1; s->has_exif = 1;
bytestream2_init(&exif_gb, avpkt->data + exif_offset, bytestream2_init(&exif_gb, avpkt->data + exif_offset,
avpkt->size - exif_offset); avpkt->size - exif_offset);
if (ff_tdecode_header(&exif_gb, &le, &ifd_offset) < 0) { if (ff_tdecode_header(&exif_gb, &le, &ifd_offset) < 0) {
av_log(avctx, AV_LOG_ERROR, "webp: invalid TIFF header " av_log(avctx, AV_LOG_ERROR, "invalid TIFF header "
"in EXIF data\n"); "in Exif data\n");
goto exif_end; goto exif_end;
} }
bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET); bytestream2_seek(&exif_gb, ifd_offset, SEEK_SET);
if (ff_exif_decode_ifd(avctx, &exif_gb, le, 0, &s->exif_metadata) < 0) { 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; goto exif_end;
} }