diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:30:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:30:01 +0200 |
| commit | 0f69f02eb746124536a81effe9000a4dc876c7d8 (patch) | |
| tree | d6842dcf0a9e76a3112796bba55bafefa85d31b6 /libavcodec/motion_est.c | |
| parent | 0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4 (diff) | |
| parent | 149fa0b7ac180fe1df48a2e379c560813555bf57 (diff) | |
Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'
* commit '149fa0b7ac180fe1df48a2e379c560813555bf57':
mpegvideo: Move MotionEstContext and function declarations to a separate header
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index ed226c5d73..96aa9ac84e 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "internal.h" #include "mathops.h" +#include "motion_est.h" #include "mpegutils.h" #include "mpegvideo.h" |