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
Vittorio Giovara
d37c96213a
lavc: restore copy_block{4,16} functions
...
They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.
2014-03-27 23:25:39 +01:00
Michael Niedermayer
990f956ce6
Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'
...
* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
copy_block: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 21:35:58 +01:00
Vittorio Giovara
b4e355c89e
copy_block: K&R formatting cosmetics
2014-03-12 14:01:41 +01:00
Michael Niedermayer
b05830169d
Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'
...
* commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a':
dsputil: Move copy_block functions to a separate header
dsputil: Drop unused functions copy_block{2|4|16}
No functions are droped because they are used in several places.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:23:59 +01:00
Diego Biurrun
b9ba5253dd
dsputil: Move copy_block functions to a separate header
2013-02-07 22:08:19 +01:00
