Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'

Browse Source

* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
	libavcodec/hevc_ps.c

See: f7f1f4c7ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-06-26 20:10:01 +02:00

parent acc7cf70dc a0e1c3517a

commit 932be89c26

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available