Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 07:55:22 +0000 (09:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 07:56:43 +0000 (09:56 +0200)
commitefc08e00cc0b05ea478aef51693199bfb0c3b489
tree3d692a005e062de8485b540da1c763355c58b611
parent39354d608933fe37a5ec86de4c691bcb46df0dac
parentb3ea76624ad1baab0b6bcc13f3f856be2f958110
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:
libavcodec/4xm.c
libavcodec/ac3enc.c
libavcodec/alsdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/dvdsubdec.c
libavcodec/gifdec.c
libavcodec/h263.c
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/ituh263enc.c
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegaudiodecheader.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/msmpeg4.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/tta.c
libavdevice/fbdev.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_frei0r.c
libavfilter/vf_libopencv.c
libavformat/asfdec.c
libavformat/isom.c
libavformat/mov.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/r3d.c
libavformat/rtmpproto.c
libavformat/rtpenc.c
libavformat/rtsp.c
libavformat/utils.c