diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2004-11-28 18:29:38 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2004-11-28 18:29:38 +0000 |
| commit | f37b9768f64f859c67b8592eca618c5d82509025 (patch) | |
| tree | 197ab0b87440b44e8d0f07590bc97b436687f3d6 /libavformat | |
| parent | 17179d2d970cae6d81074f8de204764072bcd791 (diff) | |
| download | ffmpeg-f37b9768f64f859c67b8592eca618c5d82509025.tar.gz | |
split ffhuffyuv into 2 codecs:
"huffyuv" is compatible with the official version
"ffvhuff" contains our improvements
Originally committed as revision 3720 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avienc.c | 1 | ||||
| -rw-r--r-- | libavformat/utils.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index ff15eac162..12d2fd7019 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -140,6 +140,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, + { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, diff --git a/libavformat/utils.c b/libavformat/utils.c index 6b3bd5db48..a20169d5d2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -627,6 +627,7 @@ static int is_intra_only(AVCodecContext *enc){ case CODEC_ID_RAWVIDEO: case CODEC_ID_DVVIDEO: case CODEC_ID_HUFFYUV: + case CODEC_ID_FFVHUFF: case CODEC_ID_ASV1: case CODEC_ID_ASV2: case CODEC_ID_VCR1: |