Merge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:42:06 +0000 (01:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:42:06 +0000 (01:42 +0100)
* commit '5430839144c6da0160e8e0cfb0c8db01de432e94':
  eacmv: clear references on frame dimensions change

Conflicts:
libavcodec/eacmv.c

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

Simple merge