Merge commit '99404597201911de90cff2ef85f2d44176d39147'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:30:41 +0000 (13:30 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:30:41 +0000 (13:30 +0200)
commite75b2e9c4b91ba9056768e343956d37169445685
tree7596a50adc0ac1b919f41a93bfd48cc85f428cf7
parent264ff3dd2e5c0ca9963809730cb95614251b39d5
parent99404597201911de90cff2ef85f2d44176d39147
Merge commit '99404597201911de90cff2ef85f2d44176d39147'

* commit '99404597201911de90cff2ef85f2d44176d39147':
  mmaldec: fix pkt_dts determination

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