]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf47a6a 19f5384)
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)
* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
  h264_parser: Fix order of operations

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.