• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 13b7781e
    Michael Niedermayer authored
    * qatar/master: (23 commits)
      x86inc: use sse versions of common macros instead of sse2 when applicable
      doc/APIchanges: add missing dates and hashes
      lavf: don't return from void av_update_cur_dts()
      Changelog: add more entries.
      Changelog: update ffmpeg/avconv incompatibility list.
      avconv: remove some redundant temporary variables.
      avconv: fix broken indentation
      avconv: move copy_initial_nonkeyframes to the options context.
      avconv: use file:stream instead of file.stream in log messages.
      doc/avconv: elaborate on basic functionality.
      doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
      openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
      Call avformat_network_init/deinit in the programs
      Remove leftover includes of strings.h
      avutil: Don't allow using strcasecmp/strncasecmp
      Replace all usage of strcasecmp/strncasecmp
      avstring: Add locale independent implementations of strcasecmp/strncasecmp
      avstring: Add locale independent implementations of toupper/tolower
      cosmetics: insert some spaces in explicit enum value assignments
      move 8SVX audio codecs to the audio codec list part on the next bump
      ...
    
    Conflicts:
    	avprobe.c
    	doc/APIchanges
    	ffplay.c
    	ffserver.c
    	libavcodec/avcodec.h
    	libavdevice/bktr.c
    	libavdevice/v4l.c
    	libavdevice/v4l2.c
    	libavformat/matroskaenc.c
    	libavformat/wtv.c
    	libavutil/avstring.c
    	libavutil/avstring.h
    	libavutil/avutil.h
    	libswscale/x86/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    13b7781e
dict.c 3.47 KB