diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2012-09-14 23:31:47 +0200 |
|---|---|---|
| committer | Alexander Strasser <eclipse7@gmx.net> | 2012-09-15 22:58:12 +0200 |
| commit | 49f3b331c78b6bf70bb880754d214893f265eda9 (patch) | |
| tree | b8aa6e7b6ae33666fab9acb332f86bb0f1fa5532 | |
| parent | 3245be95ace663a689b5a95ed76dc0708aae3285 (diff) | |
| download | ffmpeg-49f3b331c78b6bf70bb880754d214893f265eda9.tar.gz | |
lavf/segment: Use distinct IDs for list type ext & csv
Remove a bogus warning when using segment_list_type csv.
The LIST_TYPE_EXT constant is only used internally, so it can
be removed when the feature (segment_list_type ext) gets removed.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
| -rw-r--r-- | libavformat/segment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index fbfd677079..05d0db7515 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -41,10 +41,10 @@ typedef enum { LIST_TYPE_FLAT = 0, LIST_TYPE_CSV, LIST_TYPE_M3U8, + LIST_TYPE_EXT, ///< deprecated LIST_TYPE_NB, } ListType; -#define LIST_TYPE_EXT LIST_TYPE_CSV #define SEGMENT_LIST_FLAG_CACHE 1 #define SEGMENT_LIST_FLAG_LIVE 2 @@ -199,7 +199,7 @@ static int segment_end(AVFormatContext *s) if (seg->list_type == LIST_TYPE_FLAT) { avio_printf(seg->list_pb, "%s\n", oc->filename); - } else if (seg->list_type == LIST_TYPE_EXT) { + } else if (seg->list_type == LIST_TYPE_CSV || seg->list_type == LIST_TYPE_EXT) { print_csv_escaped_str(seg->list_pb, oc->filename); avio_printf(seg->list_pb, ",%f,%f\n", seg->start_time, seg->end_time); } else if (seg->list_type == LIST_TYPE_M3U8) { |