diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 23:25:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 00:10:09 +0100 |
| commit | 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7 (patch) | |
| tree | 9e4bc555b84b69c3b0fe487d9a0a406971af9641 /libavcodec/gsm_parser.c | |
| parent | 54db7df34b6b816534da8ab6ecf179f115e49f42 (diff) | |
| parent | 66028b7ba6b411ba12ef553e9c8f1f4a4fe27710 (diff) | |
| download | ffmpeg-4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7.tar.gz | |
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
udp: Use AVOptions
Conflicts:
libavformat/udp.c
See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm_parser.c')
0 files changed, 0 insertions, 0 deletions