Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:07:09 +0000 (15:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:07:09 +0000 (15:07 +0200)
* commit '1115689d54ea95a084421f5a182b8dc56cbff978':
  svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Conflicts:
libavcodec/svq3.c

See: 019eb2c77b7c315580200a5dbe6dabb1c97a3764
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/svq3.c

Simple merge