Merge commit '52a2c17ec006282f388071a831dfb21288611253'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:35:11 +0000 (21:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 19:35:11 +0000 (21:35 +0200)
* commit '52a2c17ec006282f388071a831dfb21288611253':
  hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

Conflicts:
libavcodec/hevc_refs.c

See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge