History

avcodec/parser: Schedule av_parser_change for removal

Originally deprecated in 748c2fca7e4d99357c234936aa71212a6282be36, publically deprecated in 9a07c1332cfe092b57b5758f22b686ca58806c60 (merged into FFmpeg in 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9).

Andreas Rheinhardt committed 5 years ago

Commit dc20b271 parent 64af1453 files · +10 −2Browse files

Unified · Split

3 files
  1. libavcodec/avcodec.h +5 −1
  2. libavcodec/parser.c +2 −1
  3. libavcodec/version.h +3 −0
libavcodec/avcodec.h+5−1
@@ -3576,14 +3576,18 @@ int av_parser_parse2(AVCodecParserContext *s, · 3575 unmodified lines
35763576 int64_t pts, int64_t dts,
35773577 int64_t pos);
35783578
3579+#if FF_API_PARSER_CHANGE
35793580 /**
35803581 * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
3581− * @deprecated use AVBitStreamFilter
3582+ * @deprecated Use dump_extradata, remove_extra or extract_extradata
3583+ * bitstream filters instead.
35823584 */
3585+attribute_deprecated
35833586 int av_parser_change(AVCodecParserContext *s,
35843587 AVCodecContext *avctx,
35853588 uint8_t **poutbuf, int *poutbuf_size,
35863589 const uint8_t *buf, int buf_size, int keyframe);
3590+#endif
35873591 void av_parser_close(AVCodecParserContext *s);
35883592
35893593 /**
libavcodec/parser.c+2−1
@@ -186,6 +186,7 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, · 185 unmodified lines
186186 return index;
187187 }
188188
189+#if FF_API_PARSER_CHANGE
189190 int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
190191 uint8_t **poutbuf, int *poutbuf_size,
191192 const uint8_t *buf, int buf_size, int keyframe)
@@ -220,7 +221,7 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, · 28 unmodified lines
220221
221222 return 0;
222223 }
223−
224+#endif
224225 void av_parser_close(AVCodecParserContext *s)
225226 {
226227 if (s) {
libavcodec/version.h+3−0
@@ -150,6 +150,9 @@ · 149 unmodified lines
150150 #ifndef FF_API_MPV_RC_STRATEGY
151151 #define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59)
152152 #endif
153+#ifndef FF_API_PARSER_CHANGE
154+#define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59)
155+#endif
153156 #ifndef FF_API_THREAD_SAFE_CALLBACKS
154157 #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
155158 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t