diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:34:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 04:35:48 +0100 |
| commit | 3ddf9b5b7750bda97a591272fa0860e53b4f5c4f (patch) | |
| tree | c9175f613329f9612cd956efa3a99dad57f2163d /libavcodec/adx.h | |
| parent | b73aae6fe9b78905635f138c931da621f83aaa31 (diff) | |
| parent | 75af13a0e4c54ee780249e16c8e14983614e2f25 (diff) | |
| download | ffmpeg-3ddf9b5b7750bda97a591272fa0860e53b4f5c4f.tar.gz | |
Merge commit '75af13a'
* commit '75af13a':
mpegvideo: directly use frames in ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.h')
0 files changed, 0 insertions, 0 deletions