ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Feb 13 
12:32:30 2015 +0100| [3e2714992b5023260ebfafd5d8f7d4cd0e2bdd80] | committer: 
Michael Niedermayer

Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'

* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
  hevc: Use generic av_clip function, not C implementation

Conflicts:
        libavcodec/hevc.c
        libavcodec/hevc_filter.c
        libavcodec/hevc_mvs.c

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to