diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:19:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:20:18 +0200 |
| commit | 91437631d76f8ba966c370df56795bf1cf2045ad (patch) | |
| tree | b106d35ba037f9966a3f0b37ac603156544ef5c0 /libavformat/utils.c | |
| parent | 0d6ed2f13faf3b31ee5688c0def762506f39542b (diff) | |
| parent | c53effc41b9359261b17c8da3b7062369cafd686 (diff) | |
| download | ffmpeg-91437631d76f8ba966c370df56795bf1cf2045ad.tar.gz | |
Merge commit 'c53effc41b9359261b17c8da3b7062369cafd686' into release/1.1
* commit 'c53effc41b9359261b17c8da3b7062369cafd686':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions