aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-06-20 18:36:14 +0200
committerAnton Khirnov <anton@khirnov.net>2012-06-21 07:36:44 +0200
commita50b7562804e4b3e3935b4843dcbb0e48a3d1cf8 (patch)
tree5cca702f7bafae03cb4052fcd5506b4886216b72
parent005c80b645cc6ab5f30cbc3e10ab66a15dfd107e (diff)
downloadffmpeg-a50b7562804e4b3e3935b4843dcbb0e48a3d1cf8.tar.gz
lavc: remove stats_in from AVCodecContext options table.
Its documentation states that it is allocated/freed by the caller, but it is declared as an AV_OPT_TYPE_STRING AVOption. Since 367732832faaf1bac4ece37cf7fef8c911e16312 the AVOptions system frees strings automatically. This can be considered an API break, since it won't work when the caller doesn't use av_malloc() to allocate the memory or wants to use the string after closing the codec. Since there is not much value in this field being an AVOption, the best solution is to remove it from the options table.
-rw-r--r--libavcodec/options_table.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index eed3bdb483..5ecf4f7ee9 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -159,7 +159,6 @@ static const AVOption options[]={
{"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
{"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"stats_out", NULL, OFFSET(stats_out), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX},
-{"stats_in", NULL, OFFSET(stats_in), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX},
{"qsquish", "how to keep quantizer between qmin and qmax (0 = clip, 1 = use differentiable function)", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E},
{"rc_qmod_amp", "experimental quantizer modulation", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E},
{"rc_qmod_freq", "experimental quantizer modulation", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},