generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-10-13 09:34:51 +02:00
commit 92b03cf926
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/Makefile
View File

@ -138,7 +138,7 @@ OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o
OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o
OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \ OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \
flacdec_picture.o \ flac_picture.o \
oggparsevorbis.o \ oggparsevorbis.o \
vorbiscomment.o vorbiscomment.o
OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \ OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \
@ -262,7 +262,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
oggparsetheora.o \ oggparsetheora.o \
oggparsevorbis.o \ oggparsevorbis.o \
vorbiscomment.o \ vorbiscomment.o \
flacdec_picture.o flac_picture.o
OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \
vorbiscomment.o vorbiscomment.o
OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o

5
libavformat/flacdec_picture.c → libavformat/flac_picture.c
View File

@ -1,5 +1,5 @@
/* /*
* Raw FLAC demuxer * Raw FLAC picture parser
* Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2001 Fabrice Bellard
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
@ -21,7 +21,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "avformat.h" #include "avformat.h"
#include "flacdec.h" #include "flac_picture.h"
#include "id3v2.h" #include "id3v2.h"
#include "internal.h" #include "internal.h"
@ -146,5 +146,6 @@ fail:
av_buffer_unref(&data); av_buffer_unref(&data);
av_freep(&desc); av_freep(&desc);
av_freep(&pb); av_freep(&pb);
return ret; return ret;
} }

8
libavformat/flacdec.h → libavformat/flac_picture.h
View File

@ -1,5 +1,5 @@
/* /*
* Raw FLAC demuxer * Raw FLAC picture parser
* Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2001 Fabrice Bellard
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVFORMAT_FLACDEC_H #ifndef AVFORMAT_FLAC_PICTURE_H
#define AVFORMAT_FLACDEC_H #define AVFORMAT_FLAC_PICTURE_H
#include "avformat.h" #include "avformat.h"
@ -28,4 +28,4 @@
int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size); int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size);
#endif /* AVFORMAT_FLACDEC_H */ #endif /* AVFORMAT_FLAC_PICTURE_H */

2
libavformat/flacdec.c
View File

@ -21,7 +21,7 @@
#include "libavcodec/flac.h" #include "libavcodec/flac.h"
#include "avformat.h" #include "avformat.h"
#include "flacdec.h" #include "flac_picture.h"
#include "internal.h" #include "internal.h"
#include "rawdec.h" #include "rawdec.h"
#include "oggdec.h" #include "oggdec.h"

2
libavformat/oggparsevorbis.c
View File

@ -32,7 +32,7 @@
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/vorbis_parser.h" #include "libavcodec/vorbis_parser.h"
#include "avformat.h" #include "avformat.h"
#include "flacdec.h" #include "flac_picture.h"
#include "internal.h" #include "internal.h"
#include "oggdec.h" #include "oggdec.h"
#include "vorbiscomment.h" #include "vorbiscomment.h"