diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 03:26:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 03:26:43 +0100 |
| commit | 03e4c2d8333d46c598856f218d9dfeb9316266d8 (patch) | |
| tree | 67201e511fa7a8e014dcf1e876a6ba2270d6fcc5 /libavcodec/paf.c | |
| parent | 773eb74babe07bc5c97c32aa564efc40e2d4b00c (diff) | |
| parent | d37c96213a2a9e1fd8669122d5405f4ce6a99ed8 (diff) | |
| download | ffmpeg-03e4c2d8333d46c598856f218d9dfeb9316266d8.tar.gz | |
Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'
* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8':
lavc: restore copy_block{4,16} functions
Conflicts:
libavcodec/copy_block.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/paf.c')
0 files changed, 0 insertions, 0 deletions