Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:57:47 +0000 (14:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:58:55 +0000 (14:58 +0200)
commit50fd98b7ac4c410f4413d382eecb415011b37920
tree8e3048148be9293056016a6d8ad7c18508619451
parentbdb4ed963f7ecf919075838a64904fd6e49d07ba
parent488b2984fece7ad0c2596826fee18e74aa904667
Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'

* commit '488b2984fece7ad0c2596826fee18e74aa904667':
  ape demuxer: check for EOF in potentially long loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/ape.c