Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:39:16 +0000 (16:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:39:16 +0000 (16:39 +0200)
commit8fc441cee89cb3af5026facd7fc622074747e223
treeb97fac00b379ba59ef74ec659259c3e5266588ac
parent028f8c3ecb439899be02340bbede9472771e5392
parentc39f7eba01cd656e8f0eed592f93d11814736650
Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'

* commit 'c39f7eba01cd656e8f0eed592f93d11814736650':
  truemotion2: Use av_freep properly in an error path

Conflicts:
libavcodec/truemotion2.c

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