diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:36:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:36:25 +0200 |
| commit | 6c655b40eaceb77a8f4a8f32775db969935de746 (patch) | |
| tree | 827f60438d46fff1b950ec87a750869d5365a48a /libavformat/smacker.c | |
| parent | 85a3d20da55ff0eafff8ff6a3e52d52204fc6fd7 (diff) | |
| parent | bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c (diff) | |
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
smacker: check the return value of smacker_decode_tree
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smacker.c')
0 files changed, 0 insertions, 0 deletions