diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:09:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:09:38 +0200 |
| commit | f5ee10c16ac00f022e2f29bac3f51509e2799e02 (patch) | |
| tree | d26678af959764447de256eb69ae49cfc8592933 /libavcodec/mpegvideo.c | |
| parent | f9dcf1690c7c74fb8f12183f6b60c22026d632dd (diff) | |
| parent | 2f15846ad7ad57beb0bca99c624affa0facf284b (diff) | |
| download | ffmpeg-f5ee10c16ac00f022e2f29bac3f51509e2799e02.tar.gz | |
Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
mpegvideo: wmv2: Move function declarations
Conflicts:
libavcodec/wmv2.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index fb8570cc9c..4b3e939a70 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -45,6 +45,7 @@ #include "msmpeg4.h" #include "qpeldsp.h" #include "thread.h" +#include "wmv2.h" #include <limits.h> static const uint8_t ff_default_chroma_qscale_table[32] = { |