diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 05:04:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 05:06:48 +0200 |
| commit | 07ae8fa20ef202206157efebf0a09db9a9cb9634 (patch) | |
| tree | 75e15cb455b62eac5a0dff6e95cd90ffe2a99e08 /libavformat/oma.h | |
| parent | 1dacf26964c9a65380ca615d1fc09302218a539e (diff) | |
| parent | 69ab9f53f901eac6a649e22d28cf093357870627 (diff) | |
| download | ffmpeg-07ae8fa20ef202206157efebf0a09db9a9cb9634.tar.gz | |
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>
Diffstat (limited to 'libavformat/oma.h')
0 files changed, 0 insertions, 0 deletions