Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:09:33 +0000 (19:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:15:19 +0000 (19:15 +0200)
commit3e1483d03e8e2439b4c31d782bb7126ba1afdc6c
treeb67e45211796ec4045fbbba753cb533a45ebc22a
parentcf47a6a1a0848567d1453f2830d567f22e551dca
parent19f53840001a7afcdb57b2a797e363ec8081aba3
Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'

* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
  h264_parser: Fix order of operations

See: 9c0fe487c755c19da48f4cc76aba1ac0931b5863
Merged-by: Michael Niedermayer <michaelni@gmx.at>