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 | |
| parent | 3552bd93185a1f9be8733a17104f462cd7d7a9a7 (diff) | |
| parent | 5846646296e377e093441dfe9eadde38ff1f7c99 (diff) | |
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>
| -rw-r--r-- | Changelog | 4 | ||||
| -rw-r--r-- | doc/general.texi | 1 | ||||
| -rw-r--r-- | libavformat/hevcdec.c | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 7 insertions, 6 deletions
@@ -48,7 +48,9 @@ version 2.1: - ReplayGain scanner - Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support) - Linux framebuffer output device -- HEVC decoder, raw HEVC demuxer, HEVC demuxing in TS, Matroska and MP4 +- HEVC decoder +- raw HEVC demuxer +- HEVC demuxing in TS, Matroska and MP4 - mergeplanes filter 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 diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c index 88abcc6ab2..e36a0513e3 100644 --- a/libavformat/hevcdec.c +++ b/libavformat/hevcdec.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/hevc.h" + #include "avformat.h" #include "rawdec.h" -#include "libavcodec/hevc.h" - static int hevc_probe(AVProbeData *p) { uint32_t code = -1; @@ -56,8 +56,6 @@ static int hevc_probe(AVProbeData *p) } } - // printf("vps=%d, sps=%d, pps=%d, irap=%d\n", vps, sps, pps, irap); - if (vps && sps && pps && irap) return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg return 0; diff --git a/libavformat/version.h b/libavformat/version.h index a0f6c3324b..db12e57acc 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 20 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |