[FFmpeg-cvslog] Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 03:26:43 2014 +0100| [03e4c2d8333d46c598856f218d9dfeb9316266d8] | committer: Michael Niedermayer

Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'

* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8':
  lavc: restore copy_block{4,16} functions

Conflicts:
	libavcodec/copy_block.h

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

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