virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'

Browse Source 
* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
  win32: Allow other programs to open the same files
  configure: Add error_resilience as dependency to the eatqi decoder

Conflicts:
	configure
	libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-28 12:20:41 +01:00
parent dac1d92cb7 e9cc988395
commit e63ebaca16
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -1716,7 +1716,7 @@ eac3_decoder_select="ac3_decoder"
eac3_encoder_select="ac3_encoder" eac3_encoder_select="ac3_encoder"
eamad_decoder_select="aandcttables dsputil mpegvideo" eamad_decoder_select="aandcttables dsputil mpegvideo"
eatgq_decoder_select="aandcttables" eatgq_decoder_select="aandcttables"
eatqi_decoder_select="aandcttables mpegvideo" eatqi_decoder_select="aandcttables error_resilience mpegvideo"
exr_decoder_select="zlib" exr_decoder_select="zlib"
ffv1_decoder_select="dsputil golomb rangecoder" ffv1_decoder_select="dsputil golomb rangecoder"
ffv1_encoder_select="rangecoder" ffv1_encoder_select="rangecoder"