diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 11:34:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 11:37:21 +0400 |
| commit | 92b03cf926efae224762dcc74d035cbf67b45368 (patch) | |
| tree | f1e2f0063ed4040339aa4c7e815a6c579857436a /libavformat/flacdec.c | |
| parent | 8dbf98e68a9b7d92705661a2d6900c6d914a8068 (diff) | |
| parent | 601d6228c4811d8971a2412a759e1a4ab775ebe8 (diff) | |
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/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 8384076b3d..29310b831f 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -21,7 +21,7 @@ #include "libavcodec/flac.h" #include "avformat.h" -#include "flacdec.h" +#include "flac_picture.h" #include "internal.h" #include "rawdec.h" #include "oggdec.h" |