diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:13:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:14:25 +0200 |
| commit | 2a227fe8799e26fe3c8862438a163f72dca017a5 (patch) | |
| tree | 0d35c90d18c9806bc2f78d8d90b18e75324b2b2e /libavformat/sox.h | |
| parent | 5585da7c5e47810b8433f54bea5ff947251b3055 (diff) | |
| parent | 0a49a62f998747cfa564d98d36a459fe70d3299b (diff) | |
| download | ffmpeg-2a227fe8799e26fe3c8862438a163f72dca017a5.tar.gz | |
Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'
* commit '0a49a62f998747cfa564d98d36a459fe70d3299b':
h263: Always check both dimensions
Conflicts:
libavcodec/ituh263dec.c
See: 62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sox.h')
0 files changed, 0 insertions, 0 deletions