libavformat: Fix a faulty api deprecation guard in prepare_input_packet

Message ID 20161215075309.72128-1-martin@martin.st
State Committed
Commit cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2
Headers show

Commit Message

Martin Storsjö Dec. 15, 2016, 7:53 a.m.
This seems to have been added by mistake in 11de006b, by not
noticing the negation for the existing condition. This block does
not contain any code that accesses the codec field in AVStream.

This function is meant to serve as a complement to compute_pkt_fields2,
which is guarded by FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX.
---
 libavformat/mux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Diego Biurrun Dec. 15, 2016, 8:45 a.m. | #1
On Thu, Dec 15, 2016 at 09:53:09AM +0200, Martin Storsjö wrote:
> This seems to have been added by mistake in 11de006b, by not
> noticing the negation for the existing condition. This block does
> not contain any code that accesses the codec field in AVStream.
> 
> This function is meant to serve as a complement to compute_pkt_fields2,
> which is guarded by FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX.
> ---
>  libavformat/mux.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for noticing and OK.

Diego

Patch

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 37c4541..2561a6d 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -423,7 +423,7 @@  static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt)
     if (ret < 0)
         return ret;
 
-#if !FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX
+#if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX
     /* sanitize the timestamps */
     if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
         AVStream *st = s->streams[pkt->stream_index];