eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae69c683e58c33f3489b39905ea15e8fdcd42a19
ffmpeg/libavcodec/sipr.c
Michael Niedermayer 8364bde02b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
	libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22 14:04:44 +02:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink