[SCM] libav/experimental: Don't test for H264 encoding unless an encoder exists.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fedec603db2b673d122244691c950df07df95222
Author: Alexander Strange <astrange at ithinksw.com>
Date:   Wed Jul 2 21:46:18 2008 +0000

    Don't test for H264 encoding unless an encoder exists.
    
    Originally committed as revision 14048 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c13d5b3..2be9a77 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2726,9 +2726,9 @@ static void hl_decode_mb(H264Context *h){
     MpegEncContext * const s = &h->s;
     const int mb_xy= h->mb_xy;
     const int mb_type= s->current_picture.mb_type[mb_xy];
-    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || s->encoding;
+    int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
 
-    if(!s->decode)
+    if(ENABLE_H264_ENCODER && !s->decode)
         return;
 
     if (is_complex)
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 6b76420..2531e3a 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -70,6 +70,10 @@
 #endif
 #define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE)
 
+#ifndef ENABLE_H264_ENCODER
+#define ENABLE_H264_ENCODER 0
+#endif
+
 /**
  * Sequence parameter set
  */

-- 
Libav/FFmpeg packaging