Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'

Browse Source

* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

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

...

This commit is contained in:

Michael Niedermayer 2014-02-24 20:40:52 +01:00

parent a908de7f49 d00a504b24

commit a88cbdfb90

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