Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:47:18 +0000 (16:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:47:18 +0000 (16:47 +0200)
commit19769766740bf4932c7920ca61d4df41e0610083
tree6f1cb56ef5549e7442692f062a12e74457c71a1d
parent8fc441cee89cb3af5026facd7fc622074747e223
parentea78a348d86a3a733f6c1e0a65cfdd8283d924b9
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'

* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
  eacmv: Make sure a reference frame exists before referencing it

Conflicts:
libavcodec/eacmv.c

See: 113d7be62497c4e59db8f224fdb7f0a90cf17d03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/eacmv.c