OSDN Git Service

Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 22:07:08 +0000 (00:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 22:08:03 +0000 (00:08 +0200)
commit296b01d7f91f8d595269f1137f37d4b9671bfafa
treec85914f6349708dabf1b0d10ffe67aade0c637a7
parent3ce55d2e32ce37e236baad96760233be53141129
parenta7153444df9040bf6ae103e0bbf6104b66f974cb
Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb'

* commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb':
  huffyuvdec: check width size for yuv422p

Conflicts:
libavcodec/huffyuvdec.c

See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/huffyuvdec.c