diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:36:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:37:46 +0100 |
| commit | 30aa9b727da05d9bf3346ffabdbc983bd5f37616 (patch) | |
| tree | 266397b8aa8fb913c80831b39579fe6690b7d0de /libavformat/img2.c | |
| parent | a435a0337419e7080115a51c283ab0fbbd0ae83f (diff) | |
| parent | 46c0cbd5dc01196949105e49f2ded10aa85a6e39 (diff) | |
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
rtsp: suppress a incompatible pointer types warning
Conflicts:
libavformat/rtsp.c
See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions