diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:02:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:02:36 +0200 |
| commit | 45a529d805cf09d0d43342c925f38e3b56c3a6e5 (patch) | |
| tree | c732795f8f4f25fe3befd17a4a638b4221342e7e /libavcodec/libopencore-amr.c | |
| parent | 97cbad3d2c906ed5bd1c30f289f523ee2c15ab73 (diff) | |
| parent | aa943bd31fada23db5cb9611215656ab9ebe5b94 (diff) | |
| download | ffmpeg-45a529d805cf09d0d43342c925f38e3b56c3a6e5.tar.gz | |
Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2
* commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
0 files changed, 0 insertions, 0 deletions