Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'

* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
	doc/muxers.texi
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/muxers.texi
index 0dc8a33628017f3e02d3177a1f629625fa868bec,cf312c1f6c095969231997ab47cbd3a2c058ff27..f369df5ab9ca8d45d394183d8e1cf4229d0a1fa7
--- 1/doc/muxers.texi
--- 2/doc/muxers.texi
+++ b/doc/muxers.texi
@@@ -534,46 -248,9 +534,53 @@@ Add RTP hinting tracks to the output fi
  Smooth Streaming content can be pushed in real time to a publishing
  point on IIS with this muxer. Example:
  @example
 -avconv -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1)
 +ffmpeg -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1)
 +@end example
 +
 +@section mp3
 +
 +The MP3 muxer writes a raw MP3 stream with an ID3v2 header at the beginning and
 +optionally an ID3v1 tag at the end. ID3v2.3 and ID3v2.4 are supported, the
- @code{id3v2_version} option controls which one is used. The legacy ID3v1 tag is
- not written by default, but may be enabled with the @code{write_id3v1} option.
++@code{id3v2_version} option controls which one is used. Setting
++@code{id3v2_version} to 0 will disable the ID3v2 header completely. The legacy
++ID3v1 tag is not written by default, but may be enabled with the
++@code{write_id3v1} option.
 +
 +The muxer may also write a Xing frame at the beginning, which contains the
 +number of frames in the file. It is useful for computing duration of VBR files.
 +The Xing frame is written if the output stream is seekable and if the
 +@code{write_xing} option is set to 1 (the default).
 +
 +The muxer supports writing ID3v2 attached pictures (APIC frames). The pictures
 +are supplied to the muxer in form of a video stream with a single packet. There
 +can be any number of those streams, each will correspond to a single APIC frame.
 +The stream metadata tags @var{title} and @var{comment} map to APIC
 +@var{description} and @var{picture type} respectively. See
 +@url{http://id3.org/id3v2.4.0-frames} for allowed picture types.
 +
 +Note that the APIC frames must be written at the beginning, so the muxer will
 +buffer the audio frames until it gets all the pictures. It is therefore advised
 +to provide the pictures as soon as possible to avoid excessive buffering.
 +
 +Examples:
 +
 +Write an mp3 with an ID3v2.3 header and an ID3v1 footer:
 +@example
 +ffmpeg -i INPUT -id3v2_version 3 -write_id3v1 1 out.mp3
 +@end example
 +
 +To attach a picture to an mp3 file select both the audio and the picture stream
 +with @code{map}:
 +@example
 +ffmpeg -i input.mp3 -i cover.png -c copy -map 0 -map 1
 +-metadata:s:v title="Album cover" -metadata:s:v comment="Cover (Front)" out.mp3
 +@end example
 +
++Write a "clean" MP3 without any extra features:
++@example
++ffmpeg -i input.wav -write_xing 0 -id3v2_version 0 out.mp3
+ @end example
+ 
  @section mpegts
  
  MPEG transport stream muxer.

diff --cc libavformat/mp3enc.c
Simple merge

diff --cc libavformat/version.h
index 3ccbf4c4082d70e165e0d5481657b7cded8e3cda,dbdccb4cdc0d7ac275d22285fac2c85237f61691..40c56c9669732605368959b62ee48e4c8f35ffb2
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
- #define LIBAVFORMAT_VERSION_MINOR 23
- #define LIBAVFORMAT_VERSION_MICRO 103
 -#define LIBAVFORMAT_VERSION_MINOR 10
 -#define LIBAVFORMAT_VERSION_MICRO  3
++#define LIBAVFORMAT_VERSION_MINOR 24
++#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \