ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Apr 29 
11:48:39 2015 +0200| [cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4] | committer: 
Michael Niedermayer

Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'

* commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7':
  h264: move the DPB init/uninit to init_context()/free_context()

Conflicts:
        libavcodec/h264.c

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

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



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

Reply via email to