diff options
| author | Michael Niedermayer <[email protected]> | 2011-08-01 18:24:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-08-01 18:32:52 +0200 |
| commit | 03cbe6c8bc42626107e75b001180b81781619ed7 (patch) | |
| tree | f83ec1fa8adb21b5695c650c781b10631de8a4b5 /libavformat/options.c | |
| parent | 29d854d6c5b31f816b639eac231ce86afa42b11d (diff) | |
| parent | b4ea1c5a77704eb7096bc017467b774e088ef3bd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Not merged: Remove the ffserver test.
Remove ffserver.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/options.c')
0 files changed, 0 insertions, 0 deletions