Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)
commitd28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9
tree725341047df6bd3e86136bd95901d8e9a21f5359
parentb5a87dc193d6901a00aa4d195f1aae9519b8712f
parentf054e309c58894450a5d18cce9799ef58aab9f14
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>
libavcodec/qdm2.c
libavformat/westwood_vqa.c