• Michael Niedermayer's avatar
    Merge commit '23aae62c' · 91af7609
    Michael Niedermayer authored
    * commit '23aae62c':
      alsdec: Check k used for rice decoder.
      avfiltergraph: silence an uninitialized variable warning
      xsubenc: reindent
      lavc: replace AVCodecContext.encode with subtitle-specific callback
      lavc: add const to private codec class initialization.
      avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
      id3v2: strdup the genre name explicitly.
      lavf/id3v2: do not export empty fields.
      buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
      lavfi: replace empty input/output lists with null pointers
    
    Conflicts:
    	ffmpeg_filter.c
    	libavcodec/alsdec.c
    	libavcodec/dvdsubenc.c
    	libavcodec/utils.c
    	libavcodec/v210dec.h
    	libavfilter/af_channelsplit.c
    	libavfilter/avfiltergraph.c
    	libavfilter/buffersrc.c
    	libavfilter/src_movie.c
    	libavfilter/vf_ass.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    91af7609
srtenc.c 9.11 KB