ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug  5 
13:22:34 2014 +0200| [9988899993ee6c514749244ff47d43492c42f395] | committer: 
Michael Niedermayer

Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'

* commit '701e8b42e12ad625c64ceae2252acb1de390278c':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
        libavcodec/vc1_parser.c

See: a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738
Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9988899993ee6c514749244ff47d43492c42f395
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to