Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 02:26:43 +0000 (03:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 02:26:43 +0000 (03:26 +0100)
commit03e4c2d8333d46c598856f218d9dfeb9316266d8
tree67201e511fa7a8e014dcf1e876a6ba2270d6fcc5
parent773eb74babe07bc5c97c32aa564efc40e2d4b00c
parentd37c96213a2a9e1fd8669122d5405f4ce6a99ed8
Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'

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

Conflicts:
libavcodec/copy_block.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/copy_block.h