Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f2326591
Commit
f2326591
authored
Mar 01, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tiff: use AVFrame accessor functions
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e0f716a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
tiff.c
libavcodec/tiff.c
+5
-5
No files found.
libavcodec/tiff.c
View file @
f2326591
...
...
@@ -289,7 +289,7 @@ static int add_doubles_metadata(int count,
av_freep
(
&
dp
);
if
(
!
ap
)
return
AVERROR
(
ENOMEM
);
av_dict_set
(
&
s
->
picture
.
metadata
,
name
,
ap
,
AV_DICT_DONT_STRDUP_VAL
);
av_dict_set
(
ff_frame_get_metadatap
(
&
s
->
picture
)
,
name
,
ap
,
AV_DICT_DONT_STRDUP_VAL
);
return
0
;
}
...
...
@@ -315,7 +315,7 @@ static int add_shorts_metadata(int count, const char *name,
av_freep
(
&
sp
);
if
(
!
ap
)
return
AVERROR
(
ENOMEM
);
av_dict_set
(
&
s
->
picture
.
metadata
,
name
,
ap
,
AV_DICT_DONT_STRDUP_VAL
);
av_dict_set
(
ff_frame_get_metadatap
(
&
s
->
picture
)
,
name
,
ap
,
AV_DICT_DONT_STRDUP_VAL
);
return
0
;
}
...
...
@@ -334,7 +334,7 @@ static int add_string_metadata(int count, const char *name,
bytestream2_get_bufferu
(
&
s
->
gb
,
value
,
count
);
value
[
count
]
=
0
;
av_dict_set
(
&
s
->
picture
.
metadata
,
name
,
value
,
AV_DICT_DONT_STRDUP_VAL
);
av_dict_set
(
ff_frame_get_metadatap
(
&
s
->
picture
)
,
name
,
value
,
AV_DICT_DONT_STRDUP_VAL
);
return
0
;
}
...
...
@@ -1075,7 +1075,7 @@ static int decode_frame(AVCodecContext *avctx,
free_geotags
(
s
);
/* metadata has been destroyed from lavc internals, that pointer is not
* valid anymore */
s
->
picture
.
metadata
=
NULL
;
av_frame_set_metadata
(
&
s
->
picture
,
NULL
)
;
// As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
// that further identifies the file as a TIFF file"
...
...
@@ -1111,7 +1111,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log
(
avctx
,
AV_LOG_WARNING
,
"Type of GeoTIFF key %d is wrong
\n
"
,
s
->
geotags
[
i
].
key
);
continue
;
}
ret
=
av_dict_set
(
&
s
->
picture
.
metadata
,
keyname
,
s
->
geotags
[
i
].
val
,
0
);
ret
=
av_dict_set
(
ff_frame_get_metadatap
(
&
s
->
picture
)
,
keyname
,
s
->
geotags
[
i
].
val
,
0
);
if
(
ret
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Writing metadata with key '%s' failed
\n
"
,
keyname
);
return
ret
;
...
...
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