diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-12-25 13:28:05 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-12-25 13:28:05 +0100 |
| commit | b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762 (patch) | |
| tree | 341f80d55bf200c6bb195f77ce50a2fd1f030345 /audio/filter/af_lavcac3enc.c | |
| parent | 1d4273cfb52043c8165b85e9d7ac7bc14cb59cba (diff) | |
| parent | 1c761bd6f59c369e45037e80f781429da65734c3 (diff) | |
| download | mpv-b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762.tar.bz2 mpv-b3d670a3e1ee9c60be33b6e5fafdf3b6449b5762.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/filter/af_lavcac3enc.c')
| -rw-r--r-- | audio/filter/af_lavcac3enc.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index 0a7c5d4440..9df5adb96f 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -280,7 +280,6 @@ static int filter_out(struct af_instance *af) AVPacket pkt = {0}; av_init_packet(&pkt); -#if HAVE_AVCODEC_NEW_CODEC_API // Send input as long as it wants. while (1) { err = read_input_frame(af, frame); @@ -310,21 +309,6 @@ static int filter_out(struct af_instance *af) MP_FATAL(af, "Encode failed.\n"); goto done; } -#else - err = read_input_frame(af, frame); - if (err < 0) - goto done; - if (err == 0) - goto done; - err = -1; - int ok; - int lavc_ret = avcodec_encode_audio2(s->lavc_actx, &pkt, frame, &ok); - s->input->samples = 0; - if (lavc_ret < 0 || !ok) { - MP_FATAL(af, "Encode failed.\n"); - goto done; - } -#endif MP_DBG(af, "avcodec_encode_audio got %d, pending %d.\n", pkt.size, s->pending->samples + s->input->samples); |