diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-01 03:37:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-01 03:40:06 +0200 |
| commit | 818ff7ff5a192c4b0999b375e555541f05b6730d (patch) | |
| tree | 33d908e655761d82a10935f10705ddf9a42ad2f3 /libavformat/concatdec.c | |
| parent | 16dd0426e5681ff4ad0752f7fd1d27611e0cb05a (diff) | |
| parent | 0f87f9b4fceee854f09da2d1ef329245196775f8 (diff) | |
Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'
* commit '0f87f9b4fceee854f09da2d1ef329245196775f8':
lavd: Add library identifier
Conflicts:
libavdevice/version.h
See: a70b4935f1867797b62312c20035025fad8b1f94
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/concatdec.c')
0 files changed, 0 insertions, 0 deletions