diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 14:18:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 14:20:10 +0200 |
| commit | e5cb7795fcafdf6bad58ba35161527b4a03b1122 (patch) | |
| tree | a3dfbd82acdc4c2dc6205e2ee4c26ef115998d34 /libavformat/internal.h | |
| parent | 5fce29ef29e416d843a139e083ae9d3f7783132a (diff) | |
| parent | 324ff59444ff5470bb325ff1e2be7c4b054fc944 (diff) | |
Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'
* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944':
avpacket: Check for and return errors in ff_interleave_add_packet()
Conflicts:
libavformat/audiointerleave.c
libavformat/internal.h
libavformat/mux.c
See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 66fb5d64af..467e25d830 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -93,7 +93,7 @@ void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int i * @return 0, or < 0 on error */ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, - int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); + int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); void ff_read_frame_flush(AVFormatContext *s); |