diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 20:10:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 20:10:01 +0200 |
| commit | 932be89c26d71244a5d78378c2c32a826ed6a31e (patch) | |
| tree | 1d16c5912fa1551574b4df137fe57b8d7bc5d545 /libavcodec/g722.c | |
| parent | acc7cf70dc09ec3e425f7c4fa5e0be427b3f0790 (diff) | |
| parent | a0e1c3517a656dd32293f054a339e0ac73328138 (diff) | |
| download | ffmpeg-932be89c26d71244a5d78378c2c32a826ed6a31e.tar.gz | |
Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'
* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
hevc: remove unused array min_cb_addr_zs
Conflicts:
libavcodec/hevc_ps.c
See: f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.c')
0 files changed, 0 insertions, 0 deletions