[FFmpeg-cvslog] Merge commit '418693bdc5edad72b0d055f741931612d797eb05'

Michael Niedermayer git at videolan.org
Sun Dec 23 13:51:18 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 23 13:28:01 2012 +0100| [2f9903f66220b3f175c66e8543ff6066beaa7c66] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f9903f66220b3f175c66e8543ff6066beaa7c66
---





More information about the ffmpeg-cvslog mailing list