diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-04 21:55:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-04 21:55:16 +0100 |
| commit | 4a59994e03178878bd22195d4509aea5fd97fc82 (patch) | |
| tree | 5105f781694661e0d0c8c15085416817fa642762 /libavformat/rtmppkt.h | |
| parent | b2880a3de9e3e160c47c069abcc8cb60015407b6 (diff) | |
| parent | a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54 (diff) | |
Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
doc: fix a couple of typos in frame.h
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmppkt.h')
0 files changed, 0 insertions, 0 deletions