Merge commit '87a051f97633010f71dfc1d23d806856499bf231'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:30:33 +0000 (13:30 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:30:33 +0000 (13:30 +0200)
commit264ff3dd2e5c0ca9963809730cb95614251b39d5
tree7712f568c90cb95231890726ec9ea8382af941b9
parent30fb54c23f520c4bd1f6563ea1821de96b8f4a17
parent87a051f97633010f71dfc1d23d806856499bf231
Merge commit '87a051f97633010f71dfc1d23d806856499bf231'

* commit '87a051f97633010f71dfc1d23d806856499bf231':
  lavc: allow asynchronous decoders to return correct pkt_dts values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/internal.h
libavcodec/mmaldec.c
libavcodec/utils.c