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
0d53a6f5
Commit
0d53a6f5
authored
Oct 08, 2015
by
Rodger Combs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: move bitstream filter args to the bsf ctx
parent
5740dc27
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
avcodec.h
libavcodec/avcodec.h
+5
-0
bitstream_filter.c
libavcodec/bitstream_filter.c
+3
-2
version.h
libavcodec/version.h
+2
-2
No files found.
libavcodec/avcodec.h
View file @
0d53a6f5
...
...
@@ -5026,6 +5026,11 @@ typedef struct AVBitStreamFilterContext {
struct
AVBitStreamFilter
*
filter
;
AVCodecParserContext
*
parser
;
struct
AVBitStreamFilterContext
*
next
;
/**
* Internal default arguments, used if NULL is passed to av_bitstream_filter_filter().
* Not for access by library users.
*/
char
*
args
;
}
AVBitStreamFilterContext
;
...
...
libavcodec/bitstream_filter.c
View file @
0d53a6f5
...
...
@@ -73,6 +73,7 @@ void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc)
if
(
bsfc
->
filter
->
close
)
bsfc
->
filter
->
close
(
bsfc
);
av_freep
(
&
bsfc
->
priv_data
);
av_freep
(
&
bsfc
->
args
);
av_parser_close
(
bsfc
->
parser
);
av_free
(
bsfc
);
}
...
...
@@ -84,6 +85,6 @@ int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
{
*
poutbuf
=
(
uint8_t
*
)
buf
;
*
poutbuf_size
=
buf_size
;
return
bsfc
->
filter
->
filter
(
bsfc
,
avctx
,
args
,
poutbuf
,
poutbuf_size
,
buf
,
buf_size
,
keyframe
);
return
bsfc
->
filter
->
filter
(
bsfc
,
avctx
,
args
?
args
:
bsfc
->
args
,
poutbuf
,
poutbuf_size
,
buf
,
buf_size
,
keyframe
);
}
libavcodec/version.h
View file @
0d53a6f5
...
...
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR
4
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_MINOR
5
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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