Merge commit 'd513c6a0ee582d22b6e793286774abbde01f6680' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:50:11 +0000 (18:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:50:11 +0000 (18:50 +0200)
commit963514ea1a6ed4c6b601568e7efb1c0017b1cd50
tree64314ab05f18c5d9f819db17bcf29b3690224167
parentc11b3010c21a194a9e8da7f07c918ce1276e3d10
parentd513c6a0ee582d22b6e793286774abbde01f6680
Merge commit 'd513c6a0ee582d22b6e793286774abbde01f6680' into release/2.2

* commit 'd513c6a0ee582d22b6e793286774abbde01f6680':
  svq1: do not modify the input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/svq1dec.c