Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'

* commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2': libavformat: Fix a faulty api deprecation guard in prepare_input_packet Merged-by: Clément Bœsch <u@pkh.me>
8 years ago · be6f6fce2e
parent 0f00eb0e4e cdcfa97dc4
commit be6f6fce2e
1 changed files with 1 additions and 1 deletions
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@ -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];