[FFmpeg-cvslog] Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 14:24:09 2013 +0200| [204c8798a89665d78d79c77ea5cc13ff1452f2e8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=204c8798a89665d78d79c77ea5cc13ff1452f2e8
---