[FFmpeg-cvslog] Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Apr 26 16:30:01 2017 +0200| [be6f6fce2e4821f39014aae93957e5b4b87d7554] | committer: Clément Bœsch

Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'

* commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2':
  libavformat: Fix a faulty api deprecation guard in prepare_input_packet

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be6f6fce2e4821f39014aae93957e5b4b87d7554
---

 libavformat/mux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 4e21083a2b..039d992e8c 100644
--- 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];


======================================================================