• 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
Name
Last commit
Last update
..
Makefile Loading commit data...
alldevices.c Loading commit data...
alsa-audio-common.c Loading commit data...
alsa-audio-dec.c Loading commit data...
alsa-audio-enc.c Loading commit data...
alsa-audio.h Loading commit data...
avdevice.c Loading commit data...
avdevice.h Loading commit data...
bktr.c Loading commit data...
caca.c Loading commit data...
dshow.c Loading commit data...
dshow_capture.h Loading commit data...
dshow_common.c Loading commit data...
dshow_enummediatypes.c Loading commit data...
dshow_enumpins.c Loading commit data...
dshow_filter.c Loading commit data...
dshow_pin.c Loading commit data...
dv1394.c Loading commit data...
dv1394.h Loading commit data...
fbdev.c Loading commit data...
iec61883.c Loading commit data...
jack_audio.c Loading commit data...
lavfi.c Loading commit data...
libavdevice.v Loading commit data...
libcdio.c Loading commit data...
libdc1394.c Loading commit data...
openal-dec.c Loading commit data...
oss_audio.c Loading commit data...
pulse.c Loading commit data...
sdl.c Loading commit data...
sndio_common.c Loading commit data...
sndio_common.h Loading commit data...
sndio_dec.c Loading commit data...
sndio_enc.c Loading commit data...
timefilter.c Loading commit data...
timefilter.h Loading commit data...
v4l.c Loading commit data...
v4l2.c Loading commit data...
version.h Loading commit data...
vfwcap.c Loading commit data...
x11grab.c Loading commit data...