Merge commit '418693bdc5edad72b0d055f741931612d797eb05'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Dec 2012 12:28:01 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Dec 2012 12:32:40 +0000 (13:32 +0100)
commit2f9903f66220b3f175c66e8543ff6066beaa7c66
tree42a1d65cab9389b34b1f0bdeea3d76198a9552b4
parentf9d8658d67cfb478e5e36ce1d2795eabdb201bcb
parent418693bdc5edad72b0d055f741931612d797eb05
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>
libavcodec/alac.c
libavcodec/avcodec.h
libavcodec/tta.c
libavutil/opt.c