diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:25:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:25:38 +0100 |
| commit | 31a52a60c9778e3e39631a9722d4b7db931dc377 (patch) | |
| tree | 20b9bcdd19d1bc3570937308744aca43c24b2e3d /ffmpeg_opt.c | |
| parent | 33dfddf65324dcb28114ea6907071605c2c3857b (diff) | |
| parent | acb77dff6af036192f6064c84f9cccc48582989e (diff) | |
| download | ffmpeg-31a52a60c9778e3e39631a9722d4b7db931dc377.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions