[FFmpeg-cvslog] Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 12 12:37:13 2015 +0100| [22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f] | committer: Michael Niedermayer

Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'

* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
	libavformat/avio.c
	libavformat/aviobuf.c
	libavformat/swfenc.c

See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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