• Michael Niedermayer's avatar
    Merge commit '418693bd' · 2f9903f6
    Michael Niedermayer authored
    * commit '418693bd':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2f9903f6
opt.c 45.6 KB