Merge commit '91767360d86ac786571593ab11c7291010ab3829'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:40:34 +0000 (21:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:40:34 +0000 (21:40 +0200)
* commit '91767360d86ac786571593ab11c7291010ab3829':
  a64multienc: Do not entangle coded_frame

Conflicts:
libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/a64multienc.c

Simple merge