diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:55:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:55:18 +0200 |
| commit | c28bca2bdef6c4671c25b1c0b25c489f11ffad80 (patch) | |
| tree | 83a87af23c6b2536889205a2d37dfac48f155b00 /libavformat/srtp.c | |
| parent | 8aa6ffd8fa648c4e4e4819ed3976aba8ee8540f5 (diff) | |
| parent | ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1 (diff) | |
| download | ffmpeg-c28bca2bdef6c4671c25b1c0b25c489f11ffad80.tar.gz | |
Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
mxf: Remove a typo
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.c')
0 files changed, 0 insertions, 0 deletions