Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:48:39 +0000 (11:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:48:39 +0000 (11:48 +0200)
commitcd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4
tree55dbcca36fb0ff5debc922d1ac185d4b6f1dcf5b
parente8a460672f7e9aec129a7cfa01345857b1565a15
parenta6cd154463bea7eb56d28192db4c8c6d83f67fd7
Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'

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

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264_slice.c