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
44fe77b3
Commit
44fe77b3
authored
Mar 02, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: make codec_is_decoder/encoder() public.
parent
02beb982
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
10 deletions
+23
-10
APIchanges
doc/APIchanges
+3
-0
avcodec.h
libavcodec/avcodec.h
+10
-0
utils.c
libavcodec/utils.c
+9
-9
version.h
libavcodec/version.h
+1
-1
No files found.
doc/APIchanges
View file @
44fe77b3
...
...
@@ -12,6 +12,9 @@ libavutil: 2011-04-18
API changes, most recent first:
2012-03-xx - xxxxxxx - lavc 54.7.0 - avcodec.h
Add av_codec_is_encoder/decoder().
2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h
Add av_packet_shrink_side_data.
...
...
libavcodec/avcodec.h
View file @
44fe77b3
...
...
@@ -4297,4 +4297,14 @@ const AVClass *avcodec_get_class(void);
*/
int
avcodec_is_open
(
AVCodecContext
*
s
);
/**
* @return a non-zero number if codec is an encoder, zero otherwise
*/
int
av_codec_is_encoder
(
AVCodec
*
codec
);
/**
* @return a non-zero number if codec is a decoder, zero otherwise
*/
int
av_codec_is_decoder
(
AVCodec
*
codec
);
#endif
/* AVCODEC_AVCODEC_H */
libavcodec/utils.c
View file @
44fe77b3
...
...
@@ -112,12 +112,12 @@ static void avcodec_init(void)
ff_dsputil_static_init
();
}
static
av_always_inline
int
codec_is_encoder
(
AVCodec
*
codec
)
int
av_
codec_is_encoder
(
AVCodec
*
codec
)
{
return
codec
&&
(
codec
->
encode
||
codec
->
encode2
);
}
static
av_always_inline
int
codec_is_decoder
(
AVCodec
*
codec
)
int
av_
codec_is_decoder
(
AVCodec
*
codec
)
{
return
codec
&&
codec
->
decode
;
}
...
...
@@ -704,7 +704,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
/* if the decoder init function was already called previously,
free the already allocated subtitle_header before overwriting it */
if
(
codec_is_decoder
(
codec
))
if
(
av_
codec_is_decoder
(
codec
))
av_freep
(
&
avctx
->
subtitle_header
);
#define SANE_NB_CHANNELS 128U
...
...
@@ -748,7 +748,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
ret
=
AVERROR
(
EINVAL
);
goto
free_and_end
;
}
if
(
codec_is_encoder
(
avctx
->
codec
))
{
if
(
av_
codec_is_encoder
(
avctx
->
codec
))
{
int
i
;
if
(
avctx
->
codec
->
sample_fmts
)
{
for
(
i
=
0
;
avctx
->
codec
->
sample_fmts
[
i
]
!=
AV_SAMPLE_FMT_NONE
;
i
++
)
...
...
@@ -1367,7 +1367,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
av_opt_free
(
avctx
->
priv_data
);
av_opt_free
(
avctx
);
av_freep
(
&
avctx
->
priv_data
);
if
(
codec_is_encoder
(
avctx
->
codec
))
if
(
av_
codec_is_encoder
(
avctx
->
codec
))
av_freep
(
&
avctx
->
extradata
);
avctx
->
codec
=
NULL
;
avctx
->
active_thread_type
=
0
;
...
...
@@ -1385,7 +1385,7 @@ AVCodec *avcodec_find_encoder(enum CodecID id)
AVCodec
*
p
,
*
experimental
=
NULL
;
p
=
first_avcodec
;
while
(
p
)
{
if
(
codec_is_encoder
(
p
)
&&
p
->
id
==
id
)
{
if
(
av_
codec_is_encoder
(
p
)
&&
p
->
id
==
id
)
{
if
(
p
->
capabilities
&
CODEC_CAP_EXPERIMENTAL
&&
!
experimental
)
{
experimental
=
p
;
}
else
...
...
@@ -1403,7 +1403,7 @@ AVCodec *avcodec_find_encoder_by_name(const char *name)
return
NULL
;
p
=
first_avcodec
;
while
(
p
)
{
if
(
codec_is_encoder
(
p
)
&&
strcmp
(
name
,
p
->
name
)
==
0
)
if
(
av_
codec_is_encoder
(
p
)
&&
strcmp
(
name
,
p
->
name
)
==
0
)
return
p
;
p
=
p
->
next
;
}
...
...
@@ -1415,7 +1415,7 @@ AVCodec *avcodec_find_decoder(enum CodecID id)
AVCodec
*
p
;
p
=
first_avcodec
;
while
(
p
)
{
if
(
codec_is_decoder
(
p
)
&&
p
->
id
==
id
)
if
(
av_
codec_is_decoder
(
p
)
&&
p
->
id
==
id
)
return
p
;
p
=
p
->
next
;
}
...
...
@@ -1429,7 +1429,7 @@ AVCodec *avcodec_find_decoder_by_name(const char *name)
return
NULL
;
p
=
first_avcodec
;
while
(
p
)
{
if
(
codec_is_decoder
(
p
)
&&
strcmp
(
name
,
p
->
name
)
==
0
)
if
(
av_
codec_is_decoder
(
p
)
&&
strcmp
(
name
,
p
->
name
)
==
0
)
return
p
;
p
=
p
->
next
;
}
...
...
libavcodec/version.h
View file @
44fe77b3
...
...
@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR
6
#define LIBAVCODEC_VERSION_MINOR
7
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
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