OSDN Git Service

Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 00:35:17 +0000 (01:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 00:36:06 +0000 (01:36 +0100)
commit4a055f91bec2f746517ec7757e2b2a3bbdb90027
tree7f3b3f15f392a8448414cd571fdc19de80e41952
parent3929c17405e010896e56b7791084ffd9fcee3a3d
parent1b5d065ca722eb8028c7a08e054b6da3419faf5d
Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'

* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
  pmpdec: check that there is at least one audio packet.

Conflicts:
libavformat/pmpdec.c

See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/pmpdec.c