Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Sep 2011 02:11:53 +0000 (04:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Sep 2011 02:11:53 +0000 (04:11 +0200)
commit1889c6724a449b2e4826612d3b72efc76dbfb713
tree05abce06cd1151955b1f1280721044584012ee51
parentca4d71b149ebe32aeaf617ffccf362624b9aafb1
parente955a682e125d44143415ff2b96a99a4dac78da2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  AVOptions: fix av_set_string3() doxy to match reality.
  cmdutils: get rid of dummy contexts for examining AVOptions.
  lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
  AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
  cpu detection: avoid a signed overflow

Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
ffprobe.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavformat/avformat.h
libavformat/options.c
libavformat/version.h
libavutil/avutil.h
libavutil/opt.h
libavutil/x86/cpu.c
libswscale/options.c
libswscale/swscale.h