Merge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:32:04 +0000 (21:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:32:10 +0000 (21:32 +0100)
commit60190d8612d10d58bb827709550e5ef4dafc50f7
treeacad7264331d042086a9480c01219fb09ea6a71d
parent3832db1223999819e2846284292ea6f3ef1b1c49
parent90a2359fef5325f90aec0eca51b145d90ca3df7d
Merge commit '90a2359fef5325f90aec0eca51b145d90ca3df7d' into release/0.10

* commit '90a2359fef5325f90aec0eca51b145d90ca3df7d':
  nutdec: Remove unused and broken debug function stub

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