diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 14:25:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 14:25:38 +0200 |
| commit | 567616c1b34a5fca1ecba82a6ff85939b6a1371e (patch) | |
| tree | e973b46942bd0a8d91992b144c4133e3332a6b16 /libavcodec/h261data.c | |
| parent | 38d1a5a27024b90523f9c688677f423ed67e4649 (diff) | |
| parent | 8a776ad90e00ab2b98e8683ac6182d641a383c3a (diff) | |
Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
h261: Move shared data tables from a header to a proper C file
Conflicts:
libavcodec/Makefile
libavcodec/h261data.c
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261data.c')
| -rw-r--r-- | libavcodec/h261data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h261data.c b/libavcodec/h261data.c index 83d775f567..0d1f305418 100644 --- a/libavcodec/h261data.c +++ b/libavcodec/h261data.c @@ -25,9 +25,9 @@ */ #include <stdint.h> -#include "h261.h" -#include "h261data.h" +#include "rl.h" +#include "h261.h" // H.261 VLC table for macroblock addressing const uint8_t ff_h261_mba_code[35] = { |