Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:35:44 +0000 (10:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:35:44 +0000 (10:35 +0200)
commit921c1d4c95a828167342095e77bbacfad25db686
tree6ecb90b7d76e281dace7574edb7402856deb863a
parentd2d8e259fd2e5149546431b6c7d1cd3560b7ab97
parentc1076d8479a6c0ee2e0c4b0e2151df5b0228438e
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
libavcodec/h264.c

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