Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 11:33:25 +0000 (13:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 11:34:25 +0000 (13:34 +0200)
commit52dc3600a901d86cb3a4723f108cea04a594443f
tree99b817d5e4726242dce3fd7adbac92529049d8e1
parentb4c88a4c4ceae7faa66ea6b4fc66b696a597976e
parentbcbe4f3ceb6ee0210d3a401963518906c8b9b230
Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'

* commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230':
  idroqdec: Make sure a video stream has been allocated before returning packets

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