• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2b0cdb73
    Michael Niedermayer authored
    * qatar/master:
      Move id3v2 tag writing to a separate file.
      swscale: add missing colons to x86 assembly yuv2planeX.
      g722: split decoder and encoder into separate files
      cosmetics: remove extra spaces before end-of-statement semi-colons
      vorbisdec: check output buffer size before writing output
      wavpack: calculate bpp using av_get_bytes_per_sample()
      ac3enc: Set max value for mode options correctly
      lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
      mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
      mpeg12: move full_pel from MpegEncContext to Mpeg1Context
      mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
      mpegvideo: remove some unused variables from MpegEncContext.
    
    Conflicts:
    	libavcodec/mpeg12.c
    	libavformat/mp3enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2b0cdb73
mp3enc.c 10.5 KB