diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-01 21:03:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-01 21:03:10 +0200 |
| commit | fde2e35e56424e2fc9b05cd763638c1b52b41ca4 (patch) | |
| tree | e09d6c24a132930c3108fee952acad4cda55e571 /libavformat/subtitles.c | |
| parent | 5dd5b7d5312d2b7cb6d3dbfde12f1eaef7c7767f (diff) | |
| parent | 3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc (diff) | |
| download | ffmpeg-fde2e35e56424e2fc9b05cd763638c1b52b41ca4.tar.gz | |
Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc'
* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
rtp: Map the urloptions to AVOptions
Conflicts:
libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.c')
0 files changed, 0 insertions, 0 deletions