OSDN Git Service

Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:35:55 +0000 (12:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:38:58 +0000 (12:38 +0100)
commit4b3b702f9256e8184cb3883460ba3805d9f2ca45
tree4047c9b3a494b768fd6a7fa346808e2f1986ce19
parentd7fbb63122b87347e57cd8a586adff09f8de5921
parentce9bba5340a5fb6f38974a19af019dd6aa2da035
Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'

* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
  avidec: fix a memleak in the dv init code.

Conflicts:
libavformat/avidec.c

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