Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 03:04:13 +0000 (05:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 03:06:48 +0000 (05:06 +0200)
commit07ae8fa20ef202206157efebf0a09db9a9cb9634
tree75e15cb455b62eac5a0dff6e95cd90ffe2a99e08
parent1dacf26964c9a65380ca615d1fc09302218a539e
parent69ab9f53f901eac6a649e22d28cf093357870627
Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'

* commit '69ab9f53f901eac6a649e22d28cf093357870627':
  hevc: split bitstream unescaping to a separate file

Conflicts:
libavcodec/Makefile
libavcodec/hevc.c

See: afa93d198aaf2cc661c4df6d4095cd030265d30a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_parse.c