diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 12:19:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 12:37:03 +0100 |
| commit | e5212354eadd4acbdc1bfeeafa5e50eb1ec5c337 (patch) | |
| tree | 6d894a25a0c708b840e4c6868ca62e17a6df5d93 /libavcodec/aacsbrdata.h | |
| parent | bcb15e66f7c46e036be198ecc9ea5f66dc0a537c (diff) | |
| parent | b9ee5f2cab3ffe1c962e542346b1ed61394864ec (diff) | |
| download | ffmpeg-e5212354eadd4acbdc1bfeeafa5e50eb1ec5c337.tar.gz | |
Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
indeo3: replace use of copy_block4 with put_pixels
mjpegdec: use put_pixels instead of copy_block8
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbrdata.h')
0 files changed, 0 insertions, 0 deletions