diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:42:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:42:49 +0200 |
| commit | 0965be00fe20e30912b3f51a32a3e435e9996f3e (patch) | |
| tree | 037f76d71a619f6c746ba9bb49a307ebd7c8c9b3 /libavformat/rtsp.h | |
| parent | c7b0a84e1fe1ba4415d5d578ddb9532d379201cf (diff) | |
| parent | 4d1f31ea44f82adfb2b712534d71e27233a4f785 (diff) | |
| download | ffmpeg-0965be00fe20e30912b3f51a32a3e435e9996f3e.tar.gz | |
Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
lavfi: make AVFilterContext export filter options.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
0 files changed, 0 insertions, 0 deletions