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 | |
parent | 39354d608933fe37a5ec86de4c691bcb46df0dac (diff) | |
parent | b3ea76624ad1baab0b6bcc13f3f856be2f958110 (diff) | |
download | ffmpeg-streaming-efc08e00cc0b05ea478aef51693199bfb0c3b489.zip ffmpeg-streaming-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>
40 files changed, 13 insertions, 94 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index cd22aa4..d2c90ac 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -24,6 +24,7 @@ * 4XM codec. */ +#include "libavutil/avassert.h" #include "libavutil/frame.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" @@ -32,7 +33,6 @@ #include "get_bits.h" #include "internal.h" -#include "libavutil/avassert.h" #define BLOCK_TYPE_VLC_BITS 5 #define ACDC_VLC_BITS 9 diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index ff20965..a0b810e 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -26,8 +26,6 @@ * The simplest AC-3 encoder. */ -//#define ASSERT_LEVEL 2 - #include <stdint.h> #include "libavutil/attributes.h" diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 96d467c..e7aeb0c 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" diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 11bed00..e96369b 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define TRACE -//#define DEBUG - #include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 42b4750..3b11183 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -23,7 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG #define RC_VARIANCE 1 // use variance or ssd for fast rc #include "libavutil/attributes.h" diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 07a95af..4381caa 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -34,9 +34,6 @@ #include "avcodec.h" #include "rnd_avg.h" - -//#define DEBUG - /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 4e9c6c4..38af768 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -27,8 +27,6 @@ #include "libavutil/imgutils.h" #include "libavutil/avstring.h" -//#define DEBUG - typedef struct DVDSubContext { AVClass *class; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 5ca82e3..4c1cb83 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG - #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/h263.c b/libavcodec/h263.c index e60e58e..eda61f6 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -27,7 +27,6 @@ * h263/mpeg4 codec. */ -//#define DEBUG #include <limits.h> #include "avcodec.h" @@ -39,8 +38,6 @@ #include "flv.h" #include "mpeg4video.h" -//#undef NDEBUG -//#include <assert.h> uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 7d28872..bf9e072 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -41,8 +41,6 @@ #include "flv.h" #include "mpeg4video.h" -//#define DEBUG - av_cold int ff_h263_decode_init(AVCodecContext *avctx) { MpegEncContext *s = avctx->priv_data; diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index c104cae..6d06a09 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -28,8 +28,6 @@ */ #define UNCHECKED_BITSTREAM_READER 1 - -//#define DEBUG #include <limits.h> #include "libavutil/attributes.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index a17f63a..2db9581 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -27,7 +27,6 @@ * h263 bitstream encoder. */ -//#define DEBUG #include <limits.h> #include "libavutil/attributes.h" diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 5369c05..f4d8abe 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)\ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 78c46fe..b5ef966 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -25,7 +25,6 @@ * MPEG-1/2 decoder */ -//#define DEBUG #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "internal.h" diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 7841b30..1772c2a 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -24,7 +24,6 @@ * MPEG Audio header decoder. */ -//#define DEBUG #include "avcodec.h" #include "mpegaudio.h" #include "mpegaudiodata.h" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c4455ac..d61d684 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -42,9 +42,6 @@ #include "thread.h" #include <limits.h> -//#undef NDEBUG -//#include <assert.h> - static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, int16_t *block, int n, int qscale); static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, @@ -60,9 +57,6 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, static void dct_unquantize_h263_inter_c(MpegEncContext *s, int16_t *block, int n, int qscale); -//#define DEBUG - - static const uint8_t ff_default_chroma_qscale_table[32] = { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5858865..0db2f83 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -52,17 +52,12 @@ #include <limits.h> #include "sp5x.h" -//#undef NDEBUG -//#include <assert.h> - static int encode_picture(MpegEncContext *s, int picture_number); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int sse_mb(MpegEncContext *s); static void denoise_dct_c(MpegEncContext *s, int16_t *block); static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); -//#define DEBUG - static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1]; static uint8_t default_fcode_tab[MAX_MV * 2 + 1]; diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 766415e..a054520 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -45,7 +45,6 @@ * - (encoding) select best mv table (two choices) * - (encoding) select best vlc/dc table */ -//#define DEBUG /* This table is practically identical to the one from h263 * except that it is inverted. */ diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 086f3b41..8b33826 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -35,8 +35,6 @@ #include <zlib.h> -//#define DEBUG - typedef struct PNGDecContext { PNGDSPContext dsp; AVCodecContext *avctx; diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index aa14c24..dc86171 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -33,8 +33,6 @@ #include <zlib.h> -//#define DEBUG - #define IOBUF_SIZE 4096 typedef struct PNGEncContext { diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 8ee3391..8d4f759 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -32,8 +32,6 @@ #include "mpeg4video.h" #include "h263.h" -//#define DEBUG - #define RV_GET_MAJOR_VER(x) ((x) >> 28) #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF) #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 35f9dea..9b47d2e 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -40,8 +40,6 @@ #include "rv34data.h" #include "rv34.h" -//#define DEBUG - static inline void ZERO8x2(void* dst, int stride) { fill_rectangle(dst, 1, 2, stride, 0, 4); diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 8b4ca5a..cd00b88 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -28,7 +28,6 @@ */ #define BITSTREAM_READER_LE -//#define DEBUG #include <limits.h> #include "avcodec.h" #include "get_bits.h" diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 30595bd..02efdf9 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -27,8 +27,6 @@ * @see http://linux-fbdev.sourceforge.net/ */ -/* #define DEBUG */ - #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index fbf42f2..af5db7a 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -27,8 +27,6 @@ * @todo support a PTS correction mechanism */ -/* #define DEBUG */ - #include <float.h> #include "libavutil/attributes.h" diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 25dde7f..f8ed427 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -77,9 +77,9 @@ static av_cold int init(AVFilterContext *ctx) static int filter_frame(AVFilterLink *link, AVFrame *frame) { - AspectContext *aspect = link->dst->priv; + AspectContext *s = link->dst->priv; - frame->sample_aspect_ratio = aspect->aspect; + frame->sample_aspect_ratio = s->aspect; return ff_filter_frame(link->dst->outputs[0], frame); } @@ -99,15 +99,15 @@ static inline void compute_dar(AVRational *dar, AVRational sar, int w, int h) static int setdar_config_props(AVFilterLink *inlink) { - AspectContext *aspect = inlink->dst->priv; - AVRational dar = aspect->aspect, old_dar; + AspectContext *s = inlink->dst->priv; + AVRational dar = s->aspect, old_dar; AVRational old_sar = inlink->sample_aspect_ratio; - if (aspect->aspect.num && aspect->aspect.den) { - av_reduce(&aspect->aspect.num, &aspect->aspect.den, - aspect->aspect.num * inlink->h, - aspect->aspect.den * inlink->w, INT_MAX); - inlink->sample_aspect_ratio = aspect->aspect; + if (s->aspect.num && s->aspect.den) { + av_reduce(&s->aspect.num, &s->aspect.den, + s->aspect.num * inlink->h, + s->aspect.den * inlink->w, INT_MAX); + inlink->sample_aspect_ratio = s->aspect; } else { inlink->sample_aspect_ratio = (AVRational){ 1, 1 }; dar = (AVRational){ inlink->w, inlink->h }; @@ -171,14 +171,14 @@ AVFilter avfilter_vf_setdar = { static int setsar_config_props(AVFilterLink *inlink) { - AspectContext *aspect = inlink->dst->priv; + AspectContext *s = inlink->dst->priv; AVRational old_sar = inlink->sample_aspect_ratio; AVRational old_dar, dar; - inlink->sample_aspect_ratio = aspect->aspect; + inlink->sample_aspect_ratio = s->aspect; compute_dar(&old_dar, old_sar, inlink->w, inlink->h); - compute_dar(&dar, aspect->aspect, inlink->w, inlink->h); + compute_dar(&dar, s->aspect, inlink->w, inlink->h); av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n", inlink->w, inlink->h, old_sar.num, old_sar.den, old_dar.num, old_dar.den, inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, dar.num, dar.den); diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 72137de..3b20ee5 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -23,8 +23,6 @@ * video crop filter */ -/* #define DEBUG */ - #include <stdio.h> #include "avfilter.h" diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 345509b..ce2be64 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -22,8 +22,6 @@ * frei0r wrapper */ -/* #define DEBUG */ - #include <dlfcn.h> #include <frei0r.h> #include <stdio.h> diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index b731a1f..22d2407 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -23,8 +23,6 @@ * libopencv wrapper functions */ -/* #define DEBUG */ - #include <opencv/cv.h> #include <opencv/cxcore.h> #include "libavutil/avstring.h" diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index b2358a7..5aff1c5 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG - #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" diff --git a/libavformat/isom.c b/libavformat/isom.c index 4078c0d..4475846 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG - #include "avformat.h" #include "internal.h" #include "isom.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index a28631b..389f786 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -25,7 +25,6 @@ #include <limits.h> -//#define DEBUG //#define MOV_EXPORT_ALL_METADATA #include "libavutil/attributes.h" diff --git a/libavformat/mux.c b/libavformat/mux.c index 586137f..9de8e69 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* #define DEBUG */ - #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 5f948fa..e59bcfc 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -43,8 +43,6 @@ * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1 */ -//#define DEBUG - #include "libavutil/aes.h" #include "libavutil/avassert.h" #include "libavutil/mathematics.h" diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index ea13ee0..367b6e4 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -30,8 +30,6 @@ * SMPTE RP224: Registry of SMPTE Universal Labels */ -//#define DEBUG - #include <inttypes.h> #include <math.h> #include <time.h> diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 3b3ecce..8459cdd 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG - #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "libavutil/mathematics.h" diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d73e015..5164931 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -48,8 +48,6 @@ #include <zlib.h> #endif -//#define DEBUG - #define APP_MAX_LENGTH 1024 #define PLAYPATH_MAX_LENGTH 256 #define TCURL_MAX_LENGTH 512 diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 7adf687..2c93c20 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -28,8 +28,6 @@ #include "rtpenc.h" -//#define DEBUG - static const AVOption options[] = { FF_RTP_FLAG_OPTS(RTPMuxContext, flags), { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM }, diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a1f047b..6310d79 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -49,8 +49,6 @@ #include "rtpenc.h" #include "mpegts.h" -//#define DEBUG - /* Timeout values for socket poll, in ms, * and read_packet(), in seconds */ #define POLL_TIMEOUT_MS 100 diff --git a/libavformat/utils.c b/libavformat/utils.c index eff9373..0c40aa9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* #define DEBUG */ - #include "avformat.h" #include "avio_internal.h" #include "internal.h" |