eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '418693bdc5edad72b0d055f741931612d797eb05'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-23 13:28:01 +01:00
parent f9d8658d67 418693bdc5
commit 2f9903f662
4 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/opt.c
View File

@@ -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;
}