[FFmpeg-cvslog] Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 04:29:54 2014 +0100| [1cc9468289b266e4a8ff62d520be832f103f0afa] | committer: Michael Niedermayer

Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'

* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
  http: Always allow no-op seek

Conflicts:
	libavformat/http.c

See: 857841c1b63bf3ffacef03da2bd6275d55ead769
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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