From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 8 Jul 2013 03:02:52 +0000 (+0200)
Subject: Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
X-Git-Tag: n2.0~48
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9

Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'

* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
	libavformat/westwood_vqa.c

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

d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9