diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 23:44:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 23:45:05 +0100 |
| commit | 618d2262d71e3eca9e01b2d03d0a7d5946737cf0 (patch) | |
| tree | 31b071e41a76f12bde8a0236b2ec6ac1ddf2bc07 /libavformat/rtmpdh.h | |
| parent | 5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa (diff) | |
| parent | f06f6daaf8538eb8ceeb690b761f1256771b6ba6 (diff) | |
| download | ffmpeg-618d2262d71e3eca9e01b2d03d0a7d5946737cf0.tar.gz | |
Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'
* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
mxf: Parse random index pack
Conflicts:
libavformat/mxfdec.c
See: f5ed83c3831fcaca0f87cd67ca743946a54023d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpdh.h')
0 files changed, 0 insertions, 0 deletions