Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'

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

Conflicts:
	libavformat/avidec.c

See: 8993c25695
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-22 12:35:55 +01:00
commit 4b3b702f92

Diff Content Not Available