Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 19:37:28 +0000 (20:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 19:37:28 +0000 (20:37 +0100)
commit0b4fc4bacd866b14b74bcfb1656a1f469da6ad46
tree331df0308031c1b0871b394c96d6999b565bdac7
parent37984ca13334f1715d33fd490ef243aea6c97c09
parent3c18a7b18807de81566381a1bcbe9f6103c0296b
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'

* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
libavformat/aviobuf.c

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