diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
| commit | 1889c6724a449b2e4826612d3b72efc76dbfb713 (patch) | |
| tree | 05abce06cd1151955b1f1280721044584012ee51 /tools/graph2dot.c | |
| parent | ca4d71b149ebe32aeaf617ffccf362624b9aafb1 (diff) | |
| parent | e955a682e125d44143415ff2b96a99a4dac78da2 (diff) | |
| download | ffmpeg-1889c6724a449b2e4826612d3b72efc76dbfb713.tar.gz | |
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>
Diffstat (limited to 'tools/graph2dot.c')
0 files changed, 0 insertions, 0 deletions