diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-11 10:35:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-11 10:35:44 +0200 |
| commit | 921c1d4c95a828167342095e77bbacfad25db686 (patch) | |
| tree | 6ecb90b7d76e281dace7574edb7402856deb863a /libavformat/rtmpproto.c | |
| parent | d2d8e259fd2e5149546431b6c7d1cd3560b7ab97 (diff) | |
| parent | c1076d8479a6c0ee2e0c4b0e2151df5b0228438e (diff) | |
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
h264: check one context_init() allocation
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions