Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:53:20 +0000 (00:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:53:24 +0000 (00:53 +0100)
commit47754244463cff8873798da774605c7bf8bd763a
tree154c03edbfcb03e00d4701e549a1616c482ca5cd
parent4da8dc64be50cd814b4dab75693207dc73bca47a
parent5968415156007de5e154c6af826ab16b7373892a
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().

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