Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'

Browse Source

* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b':
  hevc: derive partially amvp list

Conflicts:
	libavcodec/hevc_mvs.c

See: bbeaae96eb
See: 3ad0460831
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-08-12 16:19:32 +02:00

parent e6ffe7bcfc 3505b19652

commit cde2de4a05

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

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

Diff Content Not Available