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)
* commit '99404597201911de90cff2ef85f2d44176d39147':
  mmaldec: fix pkt_dts determination

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

Simple merge