]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8914 feed NULL to flush encoder at the end of recording, this fixes possible infin...
authorSeven Du <dujinfang@gmail.com>
Wed, 23 Mar 2016 12:00:24 +0000 (20:00 +0800)
committerSeven Du <dujinfang@gmail.com>
Wed, 23 Mar 2016 12:13:39 +0000 (20:13 +0800)
src/mod/applications/mod_av/avformat.c

index 4d08f70644df39fa5cd81987e6271d8cea4e6636..dc8b4d9d2f6627ebc42d2a3d289d273b4afbdf0a 100644 (file)
@@ -725,7 +725,7 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 
                av_init_packet(&pkt);
 
-               ret = avcodec_encode_video2(eh->video_st->st->codec, &pkt, eh->video_st->frame, &got_packet);
+               ret = avcodec_encode_video2(eh->video_st->st->codec, &pkt, NULL, &got_packet);
 
                if (ret < 0) {
                        break;
@@ -735,6 +735,8 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
                        switch_mutex_unlock(eh->mutex);
                        av_free_packet(&pkt);
                        if (ret < 0) break;
+               } else {
+                       break;
                }
        }