diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-15 21:21:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-15 21:21:40 +0200 |
| commit | 4e160ecdbc0561068f2e690f8e9ec714e28497d0 (patch) | |
| tree | 55f0dd8ad48c8212b28ed05b735385557242702f /libavformat/mpegtsenc.c | |
| parent | 269a71b68ae7b026dfb764681f45d754f29f7aa2 (diff) | |
| parent | c88c5eef53ff1619724ba47b722da64ec0593dab (diff) | |
Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'
* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
hevc: Split the struct setup from the pps parsing
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpegtsenc.c')
0 files changed, 0 insertions, 0 deletions