ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Apr 29 
14:18:30 2015 +0200| [bd7dce594ea76b3d9a898c6ceb55ccc91ec76001] | committer: 
Michael Niedermayer

Merge commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f'

* commit '88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f':
  h264: merge the init and reinit paths in update_thread_context()

Conflicts:
        libavcodec/h264_slice.c

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

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



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

Reply via email to