• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · eadd4264
    Michael Niedermayer authored
    * qatar/master: (36 commits)
      adpcmenc: Use correct frame_size for Yamaha ADPCM.
      avcodec: add ff_samples_to_time_base() convenience function to internal.h
      adx parser: set duration
      mlp parser: set duration instead of frame_size
      gsm parser: set duration
      mpegaudio parser: set duration instead of frame_size
      (e)ac3 parser: set duration instead of frame_size
      flac parser: set duration instead of frame_size
      avcodec: add duration field to AVCodecParserContext
      avutil: add av_rescale_q_rnd() to allow different rounding
      pnmdec: remove useless .pix_fmts
      libmp3lame: support float and s32 sample formats
      libmp3lame: renaming, rearrangement, alignment, and comments
      libmp3lame: use the LAME default bit rate
      libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
      libmp3lame: cosmetics: remove some pointless comments
      libmp3lame: convert some debugging code to av_dlog()
      libmp3lame: remove outdated comment.
      libmp3lame: do not set coded_frame->key_frame.
      libmp3lame: improve error handling in MP3lame_encode_init()
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/libmp3lame.c
    	libavcodec/pcxenc.c
    	libavcodec/pnmdec.c
    	libavcodec/pnmenc.c
    	libavcodec/sgienc.c
    	libavcodec/utils.c
    	libavformat/hls.c
    	libavutil/avutil.h
    	libswscale/x86/swscale_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    eadd4264
pnmdec.c 8.17 KB