diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:52:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:52:32 +0200 |
| commit | 2e2e6b1be5913f64830cae1538696601c61c80d0 (patch) | |
| tree | a19f628dd687ca7e74d01b8d4805e8af4350f164 /libavcodec/libgsmenc.c | |
| parent | 94d4f9d405074572dc7d4ab40fe32a7e83040dc8 (diff) | |
| parent | 2601a9447efb778930b01ac58d2cc1d02498db4e (diff) | |
| download | ffmpeg-2e2e6b1be5913f64830cae1538696601c61c80d0.tar.gz | |
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
mpegts: Add HEVC definitions
Conflicts:
libavformat/mpegts.h
See: b2880a3de9e3e160c47c069abcc8cb60015407b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libgsmenc.c')
0 files changed, 0 insertions, 0 deletions