diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 09:51:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 09:51:37 +0200 |
| commit | d8b6557c866d268745123cbdd6e5431ed9261b96 (patch) | |
| tree | d4dc27854add9d3bacc3363f795182b171195857 /libavformat/latmenc.c | |
| parent | 71091698a231ca63984b2612bf16a126e6de5054 (diff) | |
| parent | bda9e6d923df6d46cc5cafb30a59a01d2514fa61 (diff) | |
| download | ffmpeg-d8b6557c866d268745123cbdd6e5431ed9261b96.tar.gz | |
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/latmenc.c')
0 files changed, 0 insertions, 0 deletions