diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:04:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:04:32 +0100 |
| commit | 4e1dc600a16e1ba302d7ac707670e4f6129d1dde (patch) | |
| tree | faf66ef166e373070fc2bb04e7c32c111ea42d5d /libavresample/resample.h | |
| parent | 682b28b41098f4445581076c44fb8420306eacec (diff) | |
| parent | 3a149e23d37f06d49ab0bb013a3b9cb0224bba5c (diff) | |
| download | ffmpeg-4e1dc600a16e1ba302d7ac707670e4f6129d1dde.tar.gz | |
Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'
* commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c':
hevc: Refactor decode_nal_sei_frame_packing_arrangement
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/resample.h')
0 files changed, 0 insertions, 0 deletions