Michael Niedermayer 03e4c2d833 Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8' ...

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

Conflicts:
	libavcodec/copy_block.h

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

2014-03-28 03:26:43 +01:00

2.3 KiB

Raw Blame History

View Raw