diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:23:48 +0100 |
| commit | 329a3286d648414b672a983427e5c7d38589f7f9 (patch) | |
| tree | 36ceddc1dd93c08dbcbffec317db574310eaf46e /libavformat/oma.h | |
| parent | 29be9b5301212d29186a05f262a6ce04ddbc168c (diff) | |
| parent | be039278b5ebd8075d90a3508db2aed5adf59e02 (diff) | |
| download | ffmpeg-329a3286d648414b672a983427e5c7d38589f7f9.tar.gz | |
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oma.h')
0 files changed, 0 insertions, 0 deletions