kierank / x262

x264 with MPEG-2 support. Part of the Open Broadcast Encoder project - http://www.ob-encoder.com/
GNU General Public License v2.0
54 stars 10 forks source link

Fix some mistakes of merge commits #4

Closed maki-rxrz closed 10 years ago

maki-rxrz commented 10 years ago

I found some mistakes in merge commits. I submit a patch to fix it.

Please check the following URL. https://gist.github.com/maki-rxrz/59fef39a49b6438b0573

Thank you.

kierank commented 10 years ago

Thanks, will merge at some point next week.