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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f56cc72bfe..510701278e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -138,7 +138,7 @@ OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \ - flacdec_picture.o \ + flac_picture.o \ oggparsevorbis.o \ vorbiscomment.o OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \ @@ -262,7 +262,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsetheora.o \ oggparsevorbis.o \ vorbiscomment.o \ - flacdec_picture.o + flac_picture.o OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ vorbiscomment.o OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o |