Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:24:09 +0000 (14:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:25:50 +0000 (14:25 +0200)
commit204c8798a89665d78d79c77ea5cc13ff1452f2e8
treee630386ba97b44ff4db431f56c814a1b77242279
parent9767d7513cbc24f01221965c95e65a73bea780d2
parent0662967d2bbdbe90540eaa8c847f521fa4b75aab
Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1

* commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab':
  hls, segment: fix splitting for audio-only streams.
  afifo: fix request_samples on the last frame in certain cases
  id3v2: check for end of file while unescaping tags
  indeo3: fix off by one in MV validity check

Conflicts:
libavformat/id3v2.c
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo3.c
libavfilter/fifo.c
libavformat/hlsenc.c
libavformat/id3v2.c