diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:31:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:33:05 +0100 |
| commit | b594aceb9482955fc5fadad51e25219cb29d4a1b (patch) | |
| tree | d9b7ba15d3c2d80d16128d6e24748c5892b1c0f4 /doc | |
| parent | 3552bd93185a1f9be8733a17104f462cd7d7a9a7 (diff) | |
| parent | 5846646296e377e093441dfe9eadde38ff1f7c99 (diff) | |
| download | ffmpeg-b594aceb9482955fc5fadad51e25219cb29d4a1b.tar.gz | |
Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
Add raw HEVC demuxer
Conflicts:
Changelog
libavformat/hevcdec.c
libavformat/version.h
See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index ecb7572f02..775e437d00 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -340,6 +340,7 @@ library: @item raw H.261 @tab X @tab X @item raw H.263 @tab X @tab X @item raw H.264 @tab X @tab X +@item raw HEVC @tab @tab X @item raw Ingenient MJPEG @tab @tab X @item raw MJPEG @tab X @tab X @item raw MLP @tab @tab X |