Mercurial > mm7
comparison VideoPlayer.h @ 2294:815d9ecf9881
Merge
author | Grumpy7 |
---|---|
date | Sun, 16 Mar 2014 19:43:28 +0100 |
parents | d65414f65bd4 |
children | 25f771e528f0 |
comparison
equal
deleted
inserted
replaced
2293:b0f10ef66e00 | 2294:815d9ecf9881 |
---|---|
103 | 103 |
104 | 104 |
105 | 105 |
106 | 106 |
107 | 107 |
108 void ShowIntroVideo_and_LoadingScreen(); | 108 void ShowMM7IntroVideo_and_LoadingScreen(); |
109 | 109 |
110 extern "C" | 110 extern "C" |
111 { | 111 { |
112 #include "lib/libavcodec/avcodec.h" | 112 #include "lib/libavcodec/avcodec.h" |
113 #include "lib/libavformat/avformat.h" | 113 #include "lib/libavformat/avformat.h" |