Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'

Browse Source

* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
  hap: Name enums, remove unused struct member

Conflicts:
	libavcodec/hap.h

See: 440c26e9c4
See: d8488090e5
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

pull/140/head

Michael Niedermayer 10 years ago

parent efa1e26122 11f3d5c69b

commit cb59d29fd6

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available