• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6c180b35
    Michael Niedermayer authored
    * qatar/master:
      mpegvideo_enc: don't use deprecated avcodec_encode_video().
      cmdutils: refactor -codecs option.
      avconv: make -shortest a per-output file option.
      lavc: add avcodec_descriptor_get_by_name().
      lavc: add const to AVCodec* function parameters.
      swf(dec): replace CODEC_ID with AV_CODEC_ID
      dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
      rtmpdh: Do not generate the same private key every time when using libnettle
      rtp: remove ff_rtp_get_rtcp_file_handle().
      rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
      avio: add (ff)url_get_multi_file_handle() for getting more than one fd
      h264: vdpau: fix crash with unsupported colorspace
      amrwbdec: Decode the fr_quality bit properly
    
    Conflicts:
    	Changelog
    	cmdutils.c
    	cmdutils_common_opts.h
    	doc/ffmpeg.texi
    	ffmpeg.c
    	ffmpeg.h
    	ffmpeg_opt.c
    	libavcodec/h264.c
    	libavcodec/options.c
    	libavcodec/utils.c
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    6c180b35