diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:28:48 +0200 |
| commit | a5ba4e186bcb44c60f215e1367e3d5269b564cea (patch) | |
| tree | 0322f254e35dda891f4f4c1ba35146d1f66b798c /libavformat/mux.c | |
| parent | dbcf7e9ef7f88c7ffb4894622223e014dac1621c (diff) | |
| parent | e926b5ceb1962833f0c884a328382bc2eca67aff (diff) | |
Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 28e3060afd..586137f391 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -637,7 +637,8 @@ next_non_null: return 0; } -static int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt) +static int interleave_compare_dts(AVFormatContext *s, AVPacket *next, + AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; AVStream *st2 = s->streams[next->stream_index]; @@ -668,7 +669,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, int i, ret; if (pkt) { - ret = ff_interleave_add_packet(s, pkt, ff_interleave_compare_dts); + ret = ff_interleave_add_packet(s, pkt, interleave_compare_dts); if (ret < 0) return ret; } |