diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 13:28:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 13:32:40 +0100 |
| commit | 2f9903f66220b3f175c66e8543ff6066beaa7c66 (patch) | |
| tree | 42a1d65cab9389b34b1f0bdeea3d76198a9552b4 /libavutil/opt.c | |
| parent | f9d8658d67cfb478e5e36ce1d2795eabdb201bcb (diff) | |
| parent | 418693bdc5edad72b0d055f741931612d797eb05 (diff) | |
Merge commit '418693bdc5edad72b0d055f741931612d797eb05'
* commit '418693bdc5edad72b0d055f741931612d797eb05':
lavc: rewrite and extend AVFrame doxy
opt: avoid segfault in av_opt_next() if the class does not have an option list
ttadec: fix last frame handling when seeking
alacdec: do not be too strict about the extradata size
Conflicts:
libavcodec/alac.c
libavcodec/avcodec.h
libavcodec/tta.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 48078e3274..61c76daa6e 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -65,7 +65,8 @@ const AVOption *av_opt_next(void *obj, const AVOption *last) AVClass *class = *(AVClass**)obj; if (!last && class->option && class->option[0].name) return class->option; - if (last && last[1].name) return ++last; + if (last && last[1].name) + return ++last; return NULL; } |