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)
commit0306436416486bf69d268da696d7159c3f29b1b4
tree95c8f14bac9fb7be59cf5d11a0c3cd25c3f62935
parentbc249bd6736f2ba5e8adbcf27b92519e89bd3754
parented61f3ca8a0664a697782253b354055136c5d303
Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

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

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