diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:58:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:59:35 +0100 |
| commit | 5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa (patch) | |
| tree | 6896e4ade41cf792bf53e240c3b3343610e37186 /libavformat/rtmpdh.h | |
| parent | 3ce858141309c09294177e63d9a36cd0924dc200 (diff) | |
| parent | 570af382eea902afe09f3562e5e1b483981cca7e (diff) | |
| download | ffmpeg-5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa.tar.gz | |
Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
mxf: Handle identification metadata
Conflicts:
libavformat/mxfdec.c
See: 25b143aa7bd60d348a449be64dadab61f0c7d068
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpdh.h')
0 files changed, 0 insertions, 0 deletions