Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 20:04:49 +0000 (21:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 20:40:09 +0000 (21:40 +0100)
commit6ef9d1b21629f005c319dfb2010154fa8e540f73
tree9450ae12c310cfbbc407a07d4eaf336e6d20383b
parent2d0117f816b92510546caf26414961ee6088f961
parentfccfc22d1f304aef42a0b960e4c1d55ce67107f5
Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile