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/msmpeg4.h | |
| parent | f9dcf1690c7c74fb8f12183f6b60c22026d632dd (diff) | |
| parent | 2f15846ad7ad57beb0bca99c624affa0facf284b (diff) | |
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/msmpeg4.h')
| -rw-r--r-- | libavcodec/msmpeg4.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index db77ce1d73..ac07762002 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -54,7 +54,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table); int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, int16_t **dc_val_ptr, int *dir_ptr); -int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]); #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ CONFIG_MSMPEG4V2_DECODER || \ |