Changeset e4a08e441eb661a6387381c6c1018eda6436eb9d

Show
Ignore:
Timestamp:
12/02/07 13:58:43 (2 years ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1171285123 +0000
git-parent:

[042e6fa3c8810a67769958f14f840280753cec9c]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1171285123 +0000
Message:

Conditionaly compile the mux fix as it requires a new (r7593 21/01/07) or newer fffmpeg.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/codec/ffmpeg/mux.c

    r40f9735 re4a08e4  
    256256    if( i_codec_id == CODEC_ID_MP2 ) 
    257257        i_codec_id = CODEC_ID_MP3; 
    258     codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );//p_input->p_fmt->i_codec; 
     258#if LIBAVFORMAT_VERSION_INT >= ((51<<16)+(8<<8)+0) 
     259    codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id ); 
     260#else 
     261#   warning "WARNING!!!!!!!" 
     262#   warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce borken files. 
     263    codec->codec_tag = p_input->p_fmt->i_codec; 
     264#endif 
    259265    codec->codec_id = i_codec_id; 
    260266