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/oggparsevorbis.c | |
| 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/oggparsevorbis.c')
| -rw-r--r-- | libavformat/oggparsevorbis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 2ecc9ce0d8..a63e5978d9 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -32,7 +32,7 @@ #include "libavcodec/get_bits.h" #include "libavcodec/vorbis_parser.h" #include "avformat.h" -#include "flacdec.h" +#include "flac_picture.h" #include "internal.h" #include "oggdec.h" #include "vorbiscomment.h" |