On Mon, Feb 20, 2012 at 06:13:13PM +0000, Paul B Mahol wrote:
>
> --- a/libavformat/img2.c
> +++ b/libavformat/img2.c
> @@ -89,32 +64,7 @@ static const IdStrMap img_tags[] = {
>
> -static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
> +enum CodecID ff_str2id(const IdStrMap *tags, const char *str)
> {
> str= strrchr(str, '.');
> @@ -129,385 +79,7 @@ static enum CodecID av_str2id(const IdStrMap *tags,
> const char *str)
> enum CodecID ff_guess_image2_codec(const char *filename)
> {
> - return av_str2id(img_tags, filename);
> + return ff_str2id(ff_img_tags, filename);
All the uses of av_str2id/ff_str2id use img_tags/ff_img_tags, so they
should really be replaced by ff_guess_image2_codec instead of making
av_str2id non-static.
> --- a/libavformat/img2.c
> +++ b/libavformat/img2.c
> @@ -20,36 +20,11 @@
>
> -typedef struct {
> - const AVClass *class; /**< Class for private options. */
> - int img_first;
> - int img_last;
> - int img_number;
> - int img_count;
> - int is_pipe;
> - char path[1024];
> - char *pixel_format; /**< Set by a private option. */
> - char *video_size; /**< Set by a private option. */
> - char *framerate; /**< Set by a private option. */
> - int loop;
> -} VideoData;
> -
> --- a/libavformat/img2.c
> +++ b/libavformat/img2enc.c
> @@ -23,329 +23,16 @@
>
> typedef struct {
> - const AVClass *class; /**< Class for private options. */
> - int img_first;
> - int img_last;
> int img_number;
> - int img_count;
> int is_pipe;
> char path[1024];
> - char *pixel_format; /**< Set by a private option. */
> - char *video_size; /**< Set by a private option. */
> - char *framerate; /**< Set by a private option. */
> - int loop;
> } VideoData;
I'm not sure maintaining the same name for the structures is a good idea.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
