os_support: fix poll() implementation

[ffmpeg] / libavformat / smacker.c

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 8a3a26e6ab2896821ed2905f8442b1ea93db8433..92da91e81e604c2ddd1e14a444eba5476bf0cf57 100644 (file)
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -213,10 +213,10 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap)
         av_free(smk->frm_flags);
         return AVERROR(EIO);
     }
-    ((int32_t*)st->codec->extradata)[0] = le2ne_32(smk->mmap_size);
-    ((int32_t*)st->codec->extradata)[1] = le2ne_32(smk->mclr_size);
-    ((int32_t*)st->codec->extradata)[2] = le2ne_32(smk->full_size);
-    ((int32_t*)st->codec->extradata)[3] = le2ne_32(smk->type_size);
+    ((int32_t*)st->codec->extradata)[0] = av_le2ne32(smk->mmap_size);
+    ((int32_t*)st->codec->extradata)[1] = av_le2ne32(smk->mclr_size);
+    ((int32_t*)st->codec->extradata)[2] = av_le2ne32(smk->full_size);
+    ((int32_t*)st->codec->extradata)[3] = av_le2ne32(smk->type_size);
 
     smk->curstream = -1;
     smk->nextpos = url_ftell(pb);
@@ -334,17 +334,14 @@ static int smacker_read_close(AVFormatContext *s)
     int i;
 
     for(i = 0; i < 7; i++)
-        if(smk->bufs[i])
-            av_free(smk->bufs[i]);
-    if(smk->frm_size)
-        av_free(smk->frm_size);
-    if(smk->frm_flags)
-        av_free(smk->frm_flags);
+        av_free(smk->bufs[i]);
+    av_free(smk->frm_size);
+    av_free(smk->frm_flags);
 
     return 0;
 }
 
-AVInputFormat smacker_demuxer = {
+AVInputFormat ff_smacker_demuxer = {
     "smk",
     NULL_IF_CONFIG_SMALL("Smacker video"),
     sizeof(SmackerContext),