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)
commit5a3a83f01df05e829141d3da65995270e0e18a04
treef19330af9fa8f49a231795ef14252ba2f2865c0f
parent8d7c4cc08238d06eb921bb0c6134a4475b0c689e
parent52a2c17ec006282f388071a831dfb21288611253
Merge commit '52a2c17ec006282f388071a831dfb21288611253'

* 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>