1. 13 Oct, 2011 2 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · f884ef00
      Michael Niedermayer authored
      * qatar/master: (31 commits)
        tiffenc: initialize forgotten avctx.
        avplay: free the active audio packet at exit.
        avplay: free rdft data used for spectrogram analysis.
        log.h: make AVClass a named struct
        fix ac3 encoder documentation
        vc1: more prettyprinting cosmetics
        vc1: prettyprint some tables
        vc1: K&R formatting cosmetics
        AVOptions: bump minor and add APIchanges entry.
        cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
        AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
        Remove all uses of deprecated AVOptions API.
        AVOptions: add av_opt_next, deprecate av_next_option.
        AVOptions: add functions for evaluating option strings.
        AVOptions: split get_number().
        AVOptions: add av_opt_get*, deprecate av_get*.
        AVOptions: add av_opt_set*().
        AVOptions: add new API for enumerating children.
        rv34: move inverse transform functions to DSP context
        flvenc: Write the right metadata entry count
        ...
      
      Conflicts:
      	avconv.c
      	cmdutils.c
      	doc/APIchanges
      	ffplay.c
      	ffprobe.c
      	libavcodec/ac3dec.c
      	libavcodec/h264.c
      	libavcodec/libvpxenc.c
      	libavcodec/libx264.c
      	libavcodec/mpeg12enc.c
      	libavcodec/options.c
      	libavdevice/libdc1394.c
      	libavdevice/v4l2.c
      	libavfilter/vf_drawtext.c
      	libavformat/flvdec.c
      	libavformat/mpegtsenc.c
      	libavformat/options.c
      	libavutil/avutil.h
      	libavutil/opt.c
      	libswscale/utils.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      f884ef00
    • John Brooks's avatar
      Correct buffer handling for RTCP packets · c1847c93
      John Brooks authored
      Previous code could read 4 bytes past the end of the buffer on a RTCP_SR
      packet or offset a pointer by an unchecked external value (payload_len),
      though neither will reliably cause a crash or other misbehavior beyond
      garbage timestamps.
      
      Additionally, unknown RTCP packet types, even in compounded packets, are
      now ignored as per RFC 3550 section 6.1, page 22, though currently this
      only has any practical effect if a sender puts an unrecognized type
      before RTCP_BYE in a compounded packet, or (incorrectly) does not put
      RTCP_SR first.
      Signed-off-by: 's avatarJohn Brooks <john.brooks@bluecherry.net>
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      c1847c93
  2. 12 Oct, 2011 38 commits