Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 18:03:29 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 18:03:45 +0000 (19:03 +0100)
* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

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

Simple merge