Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Nov 2011 02:13:42 +0000 (03:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Nov 2011 02:13:42 +0000 (03:13 +0100)
commita72580fc9efeb674257b4754ca5de0fa34b09be8
tree317e10288d30721f1f20c6c5bb9d99945d4351bd
parentbe4c9a440f4e8b6ea01112d98a2cc128b8c52295
parent3f5d6a665aba439a9309ed735e71403d236a313d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h
libavcodec/version.h
libavformat/options.c
libavutil/avutil.h
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
doc/t2h.init
libavcodec/bink.c
libavcodec/version.h
libavdevice/pulse.c
libavformat/options.c
libavutil/avutil.h
libavutil/pixdesc.c
libavutil/pixfmt.h