[FFmpeg-devel] Merge problem?

[Thierry Foucu]

Hi,

In may, there was this patch submitted
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=64bde8056337bb656a11f3c9e2857c10b94e2871

but this merge
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=7a72695c05f12f21a62dc99fa64d1726fc11b236
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=5864ce13d188260998bbf49a2a774fa9bd445c10

seems to have remove the code which was preventing probing MPEG-PS as MP3

I'm trying to find out if we still need this code or not..

Thanks