Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 02:54:21 +0000 (03:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 02:54:54 +0000 (03:54 +0100)
* qatar/master:
  hevc: Conceal zero td

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

Simple merge