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/h261dec.c | |
| parent | 38d1a5a27024b90523f9c688677f423ed67e4649 (diff) | |
| parent | 8a776ad90e00ab2b98e8683ac6182d641a383c3a (diff) | |
| download | ffmpeg-streaming-567616c1b34a5fca1ecba82a6ff85939b6a1371e.zip ffmpeg-streaming-567616c1b34a5fca1ecba82a6ff85939b6a1371e.tar.gz | |
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/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 9646967..3341522 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -30,7 +30,6 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" -#include "h261data.h" #define H261_MBA_VLC_BITS 9 #define H261_MTYPE_VLC_BITS 6 |
