Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 22:34:12 +0000 (00:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 22:34:27 +0000 (00:34 +0200)
commit15bcbc9d3b88b7f2564eca81b754b6d863906bb9
tree888b3bd58611796e8c8bbb3716cd1eb2ecdcd010
parenta822c3bd7974469d3d86abb29c8309238b5986c5
parentf89f78c1c563d98f10ee1d7e1ed67c9f9e03b741
Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc_mp4toannexb_bsf.c