[FFmpeg-cvslog] Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 25 19:03:29 2014 +0100| [0306436416486bf69d268da696d7159c3f29b1b4] | committer: Michael Niedermayer

Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0306436416486bf69d268da696d7159c3f29b1b4
---