avcodec: simplify picture references

[vlc] / modules / codec / avcodec / encoder.c

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 4cdc5729c1aa32f6f73e6f79788e6b4df256490d..1425c06176fe88e6dc5add7dc19d497141fa895d 100644 (file)
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -279,6 +279,9 @@ int OpenEncoder( vlc_object_t *p_this )
         psz_namecodec = "Raw video";
     }
 
+    if( i_cat == UNKNOWN_ES )
+        return VLC_EGENERIC;
+
     if( p_enc->fmt_out.i_cat == VIDEO_ES && i_cat != VIDEO_ES )
     {
         msg_Err( p_enc, "\"%s\" is not a video encoder", psz_namecodec );
@@ -1408,7 +1411,8 @@ void CloseEncoder( vlc_object_t *p_this )
 #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0))
     avcodec_free_frame( &p_sys->frame );
 #else
-    av_freep( &p_sys->frame );
+    av_free( p_sys->frame );
+    p_sys->frame = NULL;
 #endif
 
     vlc_avcodec_lock();