• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9d76cf0b
    Michael Niedermayer authored
    * qatar/master:
      rtpdec: Templatize the code for different g726 bitrate variants
      rv40: move loop filter to rv34dsp context
      lavf: make av_set_pts_info private.
      rtpdec: Add support for G726 audio
      rtpdec: Add an init function that can do custom codec context initialization
      avconv: make copy_tb on by default.
      matroskadec: don't set codec timebase.
      rmdec: don't set codec timebase.
      avconv: compute next_pts from input packet duration when possible.
      lavf: estimate frame duration from r_frame_rate.
      avconv: update InputStream.pts in the streamcopy case.
    
    Conflicts:
    	avconv.c
    	libavdevice/alsa-audio-dec.c
    	libavdevice/bktr.c
    	libavdevice/fbdev.c
    	libavdevice/libdc1394.c
    	libavdevice/oss_audio.c
    	libavdevice/v4l.c
    	libavdevice/v4l2.c
    	libavdevice/vfwcap.c
    	libavdevice/x11grab.c
    	libavformat/au.c
    	libavformat/eacdata.c
    	libavformat/flvdec.c
    	libavformat/mpegts.c
    	libavformat/mxfenc.c
    	libavformat/rtpdec_g726.c
    	libavformat/wtv.c
    	libavformat/xmv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9d76cf0b
vfwcap.c 14.5 KB