diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:34:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:37:21 +0200 |
commit | 92b03cf926efae224762dcc74d035cbf67b45368 (patch) | |
tree | f1e2f0063ed4040339aa4c7e815a6c579857436a /libavformat/flac_picture.h | |
parent | 8dbf98e68a9b7d92705661a2d6900c6d914a8068 (diff) | |
parent | 601d6228c4811d8971a2412a759e1a4ab775ebe8 (diff) | |
download | ffmpeg-92b03cf926efae224762dcc74d035cbf67b45368.tar.gz |
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
flac: move picture parsing code in a separate file
Conflicts:
libavformat/Makefile
libavformat/flacdec.c
See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flac_picture.h')
-rw-r--r-- | libavformat/flac_picture.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libavformat/flac_picture.h b/libavformat/flac_picture.h new file mode 100644 index 0000000000..4374b6f4f6 --- /dev/null +++ b/libavformat/flac_picture.h @@ -0,0 +1,31 @@ +/* + * Raw FLAC picture parser + * Copyright (c) 2001 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_FLAC_PICTURE_H +#define AVFORMAT_FLAC_PICTURE_H + +#include "avformat.h" + +#define RETURN_ERROR(code) do { ret = (code); goto fail; } while (0) + +int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size); + +#endif /* AVFORMAT_FLAC_PICTURE_H */ |