diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-30 01:21:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-30 01:21:30 +0200 |
| commit | 7d7fb61e0df7791c6dbdc1a5aeda63f6f47bf8a8 (patch) | |
| tree | bdb640c68ae13e91e5c0a045cb89ed9283db89ea /cmdutils.c | |
| parent | b6dfb829132d17d4a8188b06da3bc91dd951fb53 (diff) | |
| parent | fc739b3eefa0b58d64e7661621da94a94dbc8a82 (diff) | |
Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'
* commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82':
xan: Only read within the data that actually was initialized
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions