summaryrefslogtreecommitdiffstats
path: root/libavcodec/copy_block.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'Michael Niedermayer2014-03-281-15/+13
|\ | | | | | | | | | | | | | | | | | | * commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8': lavc: restore copy_block{4,16} functions Conflicts: libavcodec/copy_block.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: restore copy_block{4,16} functionsVittorio Giovara2014-03-271-0/+20
| | | | | | | | They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.
* | Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'Michael Niedermayer2014-03-121-14/+11
|\ \ | |/ | | | | | | | | | | * commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f': copy_block: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * copy_block: K&R formatting cosmeticsVittorio Giovara2014-03-121-14/+11
| |
* | Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'Michael Niedermayer2013-02-091-4/+37
|/ | | | | | | | | | * 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>
* dsputil: Move copy_block functions to a separate headerDiego Biurrun2013-02-071-0/+61
OpenPOWER on IntegriCloud