• 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
mjpegdec.c 54.8 KB