eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-19 21:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
b49d94e4f25e22c613eb767d72b053e77d6319bc
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