Revision ed19fafd

View differences:

libavcodec/avcodec.h
389 389 
    CODEC_ID_BINKAUDIO_RDFT,
390 390 
    CODEC_ID_BINKAUDIO_DCT,
391 391 
    CODEC_ID_AAC_LATM,
392 
    CODEC_ID_QDMC,
392 393 

  		




  393
  394
  
    
    /* subtitle codecs */


  		




  394
  395
  
    
    CODEC_ID_DVD_SUBTITLE= 0x17000,


  		












  

    
      libavformat/isom.c
    
  





  249
  249
  
    
    { CODEC_ID_QCELP, MKTAG('Q','c','l','q') },


  		




  250
  250
  
    
    { CODEC_ID_QCELP, MKTAG('s','q','c','p') }, /* ISO Media fourcc */


  		




  251
  251
  
    

  		




  
  252
  
    
    { CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') }, /* QDMC */


  		




  252
  253
  
    
    { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */


  		




  253
  254
  
    

  		




  254
  255
  
    
    { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') },


  		












  

    
      libavformat/mov.c
    
  





  769
  769
  
    
    if((uint64_t)atom.size > (1<<30))


  		




  770
  770
  
    
        return -1;


  		




  771
  771
  
    

  		




  772
  
  
    
    if (st->codec->codec_id == CODEC_ID_QDM2) {


  		




  773
  
  
    
        // pass all frma atom to codec, needed at least for QDM2


  		




  
  772
  
    
    if (st->codec->codec_id == CODEC_ID_QDM2 || st->codec->codec_id == CODEC_ID_QDMC) {


  		




  
  773
  
    
        // pass all frma atom to codec, needed at least for QDMC and QDM2


  		




  774
  774
  
    
        av_free(st->codec->extradata);


  		




  775
  775
  
    
        st->codec->extradata = av_mallocz(atom.size + FF_INPUT_BUFFER_PADDING_SIZE);


  		




  776
  776
  
    
        if (!st->codec->extradata)


  		












Also available in:  Unified diff