Fix merge glitch: pix_fmts should have been deleted

febe1540 · Alexander Strange · 5380fee3 · febe1540
Commit febe1540 authored Jun 16, 2010 by Alexander Strange
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

libavcodec/h264.c libavcodec/h264.c +0 -1

No files found.
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3726,7 +3726,6 @@ AVCodec h264_decoder = {
    /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS,
    .flush= flush_dpb,
    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
-    .pix_fmts= ff_hwaccel_pixfmt_list_420,
    .update_thread_context = ONLY_IF_THREADS_ENABLED(decode_update_thread_context)
 };