diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:55:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:56:43 +0200 |
commit | efc08e00cc0b05ea478aef51693199bfb0c3b489 (patch) | |
tree | 3d692a005e062de8485b540da1c763355c58b611 /libavcodec/mpeg12.c | |
parent | 39354d608933fe37a5ec86de4c691bcb46df0dac (diff) | |
parent | b3ea76624ad1baab0b6bcc13f3f856be2f958110 (diff) | |
download | ffmpeg-efc08e00cc0b05ea478aef51693199bfb0c3b489.tar.gz |
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
vf_aspect: use the name 's' for the pointer to the private context
Remove commented-out debug #define cruft
Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 5369c051c2..f4d8abecc9 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -27,7 +27,6 @@ #define UNCHECKED_BITSTREAM_READER 1 -//#define DEBUG #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/timecode.h" @@ -45,7 +44,6 @@ #include "xvmc_internal.h" #include "thread.h" - uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; #define INIT_2D_VLC_RL(rl, static_size)\ |