diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 21:02:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 21:02:57 +0100 |
| commit | dd974c1bc1dc3116fffdbbb28a4ebfce7e1318ee (patch) | |
| tree | ca854cec734822a5bff290cea0444b38a948cc86 | |
| parent | 4a8e3324fb13f32c2288e698f44222c4f5caa3f0 (diff) | |
| download | ffmpeg-dd974c1bc1dc3116fffdbbb28a4ebfce7e1318ee.tar.gz | |
libx264: Implement rgb24 support through a seperate AVCodec.
This avoids people mistakely encoding in a way that many players dont support.
Fixes Ticket658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/libx264.c | 33 |
2 files changed, 30 insertions, 4 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index dc78333a57..690a327396 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -402,6 +402,7 @@ void avcodec_register_all(void) REGISTER_ENCODER (LIBVORBIS, libvorbis); REGISTER_ENCDEC (LIBVPX, libvpx); REGISTER_ENCODER (LIBX264, libx264); + REGISTER_ENCODER (LIBX264RGB, libx264rgb); REGISTER_ENCODER (LIBXAVS, libxavs); REGISTER_ENCODER (LIBXVID, libxvid); diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index fafc3fd6a2..a31195b80d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -563,10 +563,6 @@ static const enum PixelFormat pix_fmts_8bit[] = { PIX_FMT_YUVJ420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -#ifdef X264_CSP_BGR - PIX_FMT_BGR24, - PIX_FMT_RGB24, -#endif PIX_FMT_NONE }; static const enum PixelFormat pix_fmts_9bit[] = { @@ -580,6 +576,13 @@ static const enum PixelFormat pix_fmts_10bit[] = { PIX_FMT_YUV444P10, PIX_FMT_NONE }; +static const enum PixelFormat pix_fmts_8bit_rgb[] = { +#ifdef X264_CSP_BGR + PIX_FMT_BGR24, + PIX_FMT_RGB24, +#endif + PIX_FMT_NONE +}; static av_cold void X264_init_static(AVCodec *codec) { @@ -650,6 +653,13 @@ static const AVClass class = { .version = LIBAVUTIL_VERSION_INT, }; +static const AVClass rgbclass = { + .class_name = "libx264rgb", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + static const AVCodecDefault x264_defaults[] = { { "b", "0" }, { "bf", "-1" }, @@ -690,3 +700,18 @@ AVCodec ff_libx264_encoder = { .defaults = x264_defaults, .init_static_data = X264_init_static, }; + +AVCodec ff_libx264rgb_encoder = { + .name = "libx264rgb", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_H264, + .priv_data_size = sizeof(X264Context), + .init = X264_init, + .encode = X264_frame, + .close = X264_close, + .capabilities = CODEC_CAP_DELAY, + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"), + .priv_class = &rgbclass, + .defaults = x264_defaults, + .pix_fmts = pix_fmts_8bit_rgb, +}; |