diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:38:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:38:27 +0200 |
| commit | 4a522eff006532f28c631f13a604c364102b7a6f (patch) | |
| tree | 2c3f6f2f03019c7737273d551811b0c40bd04367 /libavformat/rtmp.h | |
| parent | 301522f521f05c998fb8dfba153d49e557604507 (diff) | |
| parent | afc8685395e775fe0f2a1698b683aea4afd124af (diff) | |
| download | ffmpeg-4a522eff006532f28c631f13a604c364102b7a6f.tar.gz | |
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmp.h')
0 files changed, 0 insertions, 0 deletions