diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-27 13:54:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-27 13:55:15 +0100 |
| commit | 183bffb3a3c4bbb4b4a87bd68e7b4627f2af4f1b (patch) | |
| tree | 2727d0126d551e007881af6f8b0b63e8fa2afc5d /libavfilter/vf_w3fdif.c | |
| parent | e5c28d4f9a72691daa788a252f9b06c758882cf2 (diff) | |
| parent | b0593a4bca138f1f026d8c21e8c3daa96800afe2 (diff) | |
Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'
* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
hevc: pass the full HEVCNAL struct to decode_nal_unit
Conflicts:
libavcodec/hevc.c
See: 77140279d33006f1d949ee3717af67204dc519c6
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/vf_w3fdif.c')
0 files changed, 0 insertions, 0 deletions