Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 21:25:09 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 21:25:15 +0000 (22:25 +0100)
* commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932':
  aacdec: Don't count probed ADTS frames if there are false positives

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

Simple merge