diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-26 16:30:01 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-26 16:30:01 +0200 |
| commit | be6f6fce2e4821f39014aae93957e5b4b87d7554 (patch) | |
| tree | 887d844d465782fd861f590ffead289ba424d970 /libavformat | |
| parent | 0f00eb0e4ec173d290faa5985ac3fc4e903bb125 (diff) | |
| parent | cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2 (diff) | |
| download | ffmpeg-be6f6fce2e4821f39014aae93957e5b4b87d7554.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -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 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]; |