• Michael Niedermayer's avatar
    Merge commit 'b3ea7662' · efc08e00
    Michael Niedermayer authored
    * commit 'b3ea7662':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    efc08e00
4xm.c 33.7 KB