diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 11:35:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 11:35:08 +0100 |
| commit | a105c1f204bd820246a18b6af6d85f5a4839e000 (patch) | |
| tree | 179e89b16ba3dec2d17561fd5e806e7b279d7af5 /ffmpeg.h | |
| parent | ea38e5a6b75706477898eb1e6582d667dbb9946c (diff) | |
| parent | 857e6667f9061ae261c0b951113e4efc4329b05e (diff) | |
| download | ffmpeg-a105c1f204bd820246a18b6af6d85f5a4839e000.tar.gz | |
Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'
* commit '857e6667f9061ae261c0b951113e4efc4329b05e':
rtmpproto: Clarify a comment
Conflicts:
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions