Merge commit '722554788b77c13748e83458f626a9ac38b70072'

Browse Source

* commit '722554788b77c13748e83458f626a9ac38b70072':
  Add raw HEVC muxer

Conflicts:
	libavformat/version.h

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

...

This commit is contained in:

Michael Niedermayer 2014-02-09 19:39:11 +01:00

parent c333987876 722554788b

commit ffe987b96d

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