diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 13:57:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 13:57:36 +0200 |
| commit | 8a97f6acc8893db7cc23c27e6917b61ea10d4e74 (patch) | |
| tree | 6f99293024862f82e0eb05955b484d4be1ab6c51 /libavformat/tls.c | |
| parent | 7cfaf727a195cb8410acd7f321681617c572d6b0 (diff) | |
| parent | 25b143aa7bd60d348a449be64dadab61f0c7d068 (diff) | |
| download | ffmpeg-8a97f6acc8893db7cc23c27e6917b61ea10d4e74.tar.gz | |
Merge remote-tracking branch 'mbouron/master'
* mbouron/master:
lavf/mxfdec: handle identification metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tls.c')
0 files changed, 0 insertions, 0 deletions