Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 23:19:07 +0000 (00:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 23:20:55 +0000 (00:20 +0100)
commitde7b50e9cde715b8ccfef2c83def08b4e8581432
tree08bd0f618f53712dfcef1ad9df709ec80ea7ae7d
parentf2387152bcdc4b3a4e650f8b00600796aa0504de
parentf777504f640260337974848c7d5d7a3f064bbb45
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Lower bound check for slice offsets

Conflicts:
libavcodec/h264.c

See: 91253839e14cce9793ee93f184cef609ca8195d5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264_loopfilter.c