github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2014-03-28	Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'	Michael Niedermayer
	* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8': lavc: restore copy_block{4,16} functions Conflicts: libavcodec/copy_block.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28	lavc: restore copy_block{4,16} functions	Vittorio Giovara
	They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.
2014-03-13	Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'	Michael Niedermayer
	* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f': copy_block: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12	copy_block: K&R formatting cosmetics	Vittorio Giovara

2013-02-09	Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'	Michael Niedermayer
	* 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-08	dsputil: Move copy_block functions to a separate header	Diego Biurrun