Merge commit '9d5f4f025304ac7c69775179044e6f69f370441a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:51:18 +0000 (18:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 16:51:22 +0000 (18:51 +0200)
* commit '9d5f4f025304ac7c69775179044e6f69f370441a':
  svq1: do not modify the input packet

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

Simple merge
Simple merge