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>

diff --cc libavformat/Makefile
index f56cc72,9ff5a3c..5107012
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -261,8 -218,7 +261,8 @@@ OBJS-$(CONFIG_OGG_DEMUXER
                                              oggparsespeex.o  \
                                              oggparsetheora.o \
                                              oggparsevorbis.o \
 -                                            vorbiscomment.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

diff --cc libavformat/flac_picture.c
index 1b0bea2,69d2724..12d73e4
--- 1/libavformat/flacdec_picture.c
--- 2/libavformat/flac_picture.c
+++ b/libavformat/flac_picture.c
@@@ -1,10 -1,9 +1,10 @@@
  /*
-  * Raw FLAC demuxer
+  * Raw FLAC picture parser
 + * Copyright (c) 2001 Fabrice Bellard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
@@@ -19,9 -18,8 +19,9 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#include "libavutil/avassert.h"
  #include "avformat.h"
- #include "flacdec.h"
+ #include "flac_picture.h"
  #include "id3v2.h"
  #include "internal.h"
  

diff --cc libavformat/flac_picture.h
index dff0660,c700582..4374b6f
--- 1/libavformat/flacdec.h
--- 2/libavformat/flac_picture.h
+++ b/libavformat/flac_picture.h
@@@ -1,10 -1,9 +1,10 @@@
  /*
-  * Raw FLAC demuxer
+  * Raw FLAC picture parser
 + * Copyright (c) 2001 Fabrice Bellard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
@@@ -24,8 -23,6 +24,8 @@@
  
  #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_FLACDEC_H */
+ #endif /* AVFORMAT_FLAC_PICTURE_H */

diff --cc libavformat/flacdec.c
Simple merge

diff --cc libavformat/oggparsevorbis.c
index 2ecc9ce,1804e9a..a63e597
--- 1/libavformat/oggparsevorbis.c
--- 2/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@@ -32,7 -31,6 +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"