• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 7b376b39
    Michael Niedermayer authored
    * qatar/master:
      Handle unicode file names on windows
      rtp: Rename the open/close functions to alloc/free
      Lowercase all ff* program names.
      Refer to ff* tools by their lowercase names.
    NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
      Replace `` by $() syntax in shell scripts.
      patcheck: Allow overiding grep program(s) through environment variables.
    NOT Pulled  Remove stray libavcore and _g binary references.
      vorbis: Rename decoder/encoder files to follow general file naming scheme.
      aacenc: Fix whitespace after last commit.
      cook: Fix small typo in av_log_ask_for_sample message.
      aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
      Remove RDFT dependency from AAC decoder.
      Add some debug log messages to AAC extradata
      Fix mov debug (u)int64_t format strings.
      bswap: use native types for av_bwap16().
      doc: FLV muxing is supported.
      applehttp: Handle AES-128 encrypted streams
      Add a protocol handler for AES CBC decryption with PKCS7 padding
      doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
    
    Conflicts:
    	ffplay.c
    	ffprobe.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7b376b39
rtpdec_amr.c 6.57 KB