Michael Niedermayer 5be07d0206 Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b' ...

* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

2015-07-13 17:04:13 +02:00

1.6 KiB

Raw Blame History

View Raw