diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-29 12:41:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-29 12:41:32 +0200 |
| commit | 9d8fb23747239f6e747000254c91f0510e4eb1e1 (patch) | |
| tree | 6cc403a5ecdd1b38fb2f09a6d012a4eaa0fe8ccf /libavutil/parseutils.c | |
| parent | bc672a016fa16ed678f1f324b9b5adf0bacd4ac8 (diff) | |
| parent | 9d0b45ade864f3d2ccd8610149fe1fff53c4e937 (diff) | |
Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'
* commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937':
oma: check geob tag boundary
Conflicts:
libavformat/omadec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions