Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)
commit2dc9bcad7d57f70181ffa5c1804d1426afb50346
tree217c206aaa56b91e10384ba1ce4e6645a7c0f5d6
parentb454c64e0311d813fef9c22cf34f83c2ce77ab23
parentb805c725a31f6cb05c488e485eb6ab370a851633
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

Conflicts:
libavformat/idcin.c

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