OSDN Git Service

Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:07:48 +0000 (23:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:08:33 +0000 (23:08 +0100)
commita379813ceed6b24c149aa8e50a7bd2b09639208a
tree2282139849530947c3dabb6b430291cf071fc83c
parentcb403b2570385cbf48a11f9f48441de5cd01171e
parentb6c61fb83e876d404ac3b0b3657ebfcafdcd1926
Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'

* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hevc.c
libavformat/hevc.h
libavformat/movenc.c