avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL

Nathan Caldwell committed 14 years ago

Commit a4aa20f1 parent 620345f1 file · +9 −10Browse files

Unified · Split

     return 0;
 }
-AVCodec *avcodec_find_encoder(enum AVCodecID id)
+static AVCodec *find_encdec(enum AVCodecID id, int encoder)
 {
     AVCodec *p, *experimental = NULL;
     p = first_avcodec;
     while (p) {
-        if (av_codec_is_encoder(p) && p->id == id) {
+        if ((encoder ? av_codec_is_encoder(p) : av_codec_is_decoder(p)) &&
+            p->id == id) {
             if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) {
                 experimental = p;
             } else
     return experimental;
 }
+AVCodec *avcodec_find_encoder(enum AVCodecID id)
+{
+    return find_encdec(id, 1);
+}
 AVCodec *avcodec_find_encoder_by_name(const char *name)
 {
     AVCodec *p;
 AVCodec *avcodec_find_decoder(enum AVCodecID id)
 {
-    AVCodec *p;
+    return find_encdec(id, 0);
-    p = first_avcodec;
-    while (p) {
-        if (av_codec_is_decoder(p) && p->id == id)
-            return p;
-        p = p->next;
-    }
-    return NULL;
 }
 AVCodec *avcodec_find_decoder_by_name(const char *name)

Keyboard shortcuts