mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-26 09:12:33 +00:00
d1fa39d08d
Fixes an issue in 6.1 when reading a corrupted file with -xerror would exit with success. This specific issue is not present in master, but this should generally be a more robust behaviour. Reported-by: Andrej Peterka
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef FFTOOLS_FFMPEG_UTILS_H
|
|
#define FFTOOLS_FFMPEG_UTILS_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/frame.h"
|
|
#include "libavutil/rational.h"
|
|
|
|
#include "libavcodec/packet.h"
|
|
|
|
typedef struct Timestamp {
|
|
int64_t ts;
|
|
AVRational tb;
|
|
} Timestamp;
|
|
|
|
/**
|
|
* Merge two return codes - return one of the error codes if at least one of
|
|
* them was negative, 0 otherwise.
|
|
*/
|
|
static inline int err_merge(int err0, int err1)
|
|
{
|
|
// prefer "real" errors over EOF
|
|
if ((err0 >= 0 || err0 == AVERROR_EOF) && err1 < 0)
|
|
return err1;
|
|
return (err0 < 0) ? err0 : FFMIN(err1, 0);
|
|
}
|
|
|
|
static inline void pkt_move(void *dst, void *src)
|
|
{
|
|
av_packet_move_ref(dst, src);
|
|
}
|
|
|
|
static inline void frame_move(void *dst, void *src)
|
|
{
|
|
av_frame_move_ref(dst, src);
|
|
}
|
|
|
|
#endif // FFTOOLS_FFMPEG_UTILS_H
|