diff options
| author | Martin Storsjö <martin@martin.st> | 2016-12-15 09:45:49 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-12-15 12:01:48 +0200 |
| commit | cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2 (patch) | |
| tree | 7691d131929e5994487ee9ec41f5bfbbf45d2a98 | |
| parent | 2425d7329fdccfa9954faba748f3865151354f0c (diff) | |
| download | ffmpeg-cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2.tar.gz | |
libavformat: Fix a faulty api deprecation guard in prepare_input_packet
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.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 37c4541ad9..2561a6d6f9 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]; |