Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:30:01 +0000 (16:30 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:30:01 +0000 (16:30 +0200)
* commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2':
  libavformat: Fix a faulty api deprecation guard in prepare_input_packet

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/mux.c

index 4e21083..039d992 100644 (file)
@@ -821,7 +821,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];