diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:08:45 +0100 |
| commit | 12a4042445231a5032c9507f31d65a63d08aed1b (patch) | |
| tree | 180f2e80f78ffa176fe56af03687fff40605d7fe /ffmpeg_filter.c | |
| parent | 1dbb3cfa17c131361aa7320a1a92c2bdef018460 (diff) | |
| parent | 33452aede6acab78f726cd1924824585f00765cc (diff) | |
| download | ffmpeg-12a4042445231a5032c9507f31d65a63d08aed1b.tar.gz | |
Merge commit '33452aede6acab78f726cd1924824585f00765cc'
* commit '33452aede6acab78f726cd1924824585f00765cc':
hevc: store the VPS list as an AVBufferRef, just like the others *PS
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c
See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions