Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
8c161d78
Commit
8c161d78
authored
Mar 26, 2014
by
Thilo Borgmann
Committed by
Michael Niedermayer
Apr 05, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/exif: Make EXIF IFD decoding part of private API/ABI.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7a5537fd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
exif.c
libavcodec/exif.c
+2
-2
exif.h
libavcodec/exif.h
+1
-1
mjpegdec.c
libavcodec/mjpegdec.c
+1
-1
version.h
libavcodec/version.h
+2
-2
webp.c
libavcodec/webp.c
+1
-1
No files found.
libavcodec/exif.c
View file @
8c161d78
...
...
@@ -80,7 +80,7 @@ static int exif_decode_tag(AVCodecContext *avctx, GetByteContext *gbytes, int le
// store metadata or proceed with next IFD
ret
=
ff_tis_ifd
(
id
);
if
(
ret
)
{
ret
=
ff
_exif_decode_ifd
(
avctx
,
gbytes
,
le
,
depth
+
1
,
metadata
);
ret
=
avpriv
_exif_decode_ifd
(
avctx
,
gbytes
,
le
,
depth
+
1
,
metadata
);
}
else
{
const
char
*
name
=
exif_get_tag_name
(
id
);
char
*
use_name
=
(
char
*
)
name
;
...
...
@@ -107,7 +107,7 @@ static int exif_decode_tag(AVCodecContext *avctx, GetByteContext *gbytes, int le
}
int
ff
_exif_decode_ifd
(
AVCodecContext
*
avctx
,
GetByteContext
*
gbytes
,
int
le
,
int
avpriv
_exif_decode_ifd
(
AVCodecContext
*
avctx
,
GetByteContext
*
gbytes
,
int
le
,
int
depth
,
AVDictionary
**
metadata
)
{
int
i
,
ret
;
...
...
libavcodec/exif.h
View file @
8c161d78
...
...
@@ -164,7 +164,7 @@ static const struct exif_tag tag_list[] = { // JEITA CP-3451 EXIF specification:
/** Recursively decodes all IFD's and
* adds included TAGS into the metadata dictionary. */
int
ff
_exif_decode_ifd
(
AVCodecContext
*
avctx
,
GetByteContext
*
gbytes
,
int
le
,
int
avpriv
_exif_decode_ifd
(
AVCodecContext
*
avctx
,
GetByteContext
*
gbytes
,
int
le
,
int
depth
,
AVDictionary
**
metadata
);
#endif
/* AVCODEC_EXIF_H */
libavcodec/mjpegdec.c
View file @
8c161d78
...
...
@@ -1672,7 +1672,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
// read 0th IFD and store the metadata
// (return values > 0 indicate the presence of subimage metadata)
ret
=
ff
_exif_decode_ifd
(
s
->
avctx
,
&
gbytes
,
le
,
0
,
&
s
->
exif_metadata
);
ret
=
avpriv
_exif_decode_ifd
(
s
->
avctx
,
&
gbytes
,
le
,
0
,
&
s
->
exif_metadata
);
if
(
ret
<
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"mjpeg: error decoding EXIF data
\n
"
);
return
ret
;
...
...
libavcodec/version.h
View file @
8c161d78
...
...
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 5
6
#define LIBAVCODEC_VERSION_MICRO 10
8
#define LIBAVCODEC_VERSION_MINOR 5
7
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
libavcodec/webp.c
View file @
8c161d78
...
...
@@ -1449,7 +1449,7 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
bytestream2_seek
(
&
exif_gb
,
ifd_offset
,
SEEK_SET
);
if
(
ff
_exif_decode_ifd
(
avctx
,
&
exif_gb
,
le
,
0
,
&
s
->
exif_metadata
)
<
0
)
{
if
(
avpriv
_exif_decode_ifd
(
avctx
,
&
exif_gb
,
le
,
0
,
&
s
->
exif_metadata
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"error decoding Exif data
\n
"
);
goto
exif_end
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment