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/alsdec.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/alsdec.c')
| -rw-r--r-- | libavcodec/alsdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 96d467c7c2..e7aeb0c7f0 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -25,10 +25,6 @@ * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> */ - -//#define DEBUG - - #include "avcodec.h" #include "get_bits.h" #include "unary.h" |