diff options
| author | Michael Niedermayer <[email protected]> | 2012-12-12 09:55:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-12-12 09:55:56 +0100 |
| commit | be5389d58521514ab3cd428977a00834f375b9ee (patch) | |
| tree | 59da1dd5b8a4b09a79bec16e089a687f62ef97cb /libavresample/utils.c | |
| parent | 9138f6da4a3ee0d11947b8593db6b6b05e53fbae (diff) | |
| parent | e70c5b034c4787377e82cab2d5565486baec0c2a (diff) | |
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
swfdec: do better validation of tag length
Make LOCAL_ALIGNED syntactically similar on all systems
Conflicts:
libavformat/swfdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions