[FFmpeg-devel] [PATCH 4/4] lavf/segment: Use distinct IDs for list type ext & csv

[Stefano Sabatini]

On date Saturday 2012-09-15 01:11:45 +0200, Alexander Strasser encoded:
> 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 at gmx.net>
> ---
>  libavformat/segment.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/segment.c b/libavformat/segment.c
> index fbfd677..05d0db7 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) {

LGTM, thanks.
-- 
FFmpeg = Free and Fantastic MultiPurpose Ecletic Gospel