Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 10:08:57 +0000 (11:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 10:08:57 +0000 (11:08 +0100)
commit4342b346d273366438f10a1cc665d0c2db2af469
treeedf53510d6260436275026379cee2acfb750127e
parent0bdc5db520ba9126776dd12b6734150ebcc7c559
parent8cb7b7b461b52898765b38e3eff68c0ce88347f3
Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'

* commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3':
  movenc: Avoid leaking locally allocated data when returning on errors

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c