[Flac] Bug: flac --replay-gain thinks that I used --no-padding

[Scott F]

If I use flac to encode with the --replay-gain
option, I get a warning about the --no-padding
option...

"NOTE: --replay-gain may leave a small PADDING block even with --no-padding"

...even though I'm not using --no-padding. And the
file does end up with a small padding block, so
changing tags is slow.

I'd fixed this bug in my own copy of flac 1.1.4,
but forgot to submit the patch... I just noticed
when I upgraded to 1.2.0, this bug reappeared! :)
At the end of my email is the way I changed it;
also works for 1.2.0.

Thank you Josh for doing a bang-up job on FLAC. I
look forward to the improved 24-bit compression
that your decoder changes will allow.

Regards,
Scott





--- flac-1.1.4/src/flac/main.c.orig	Mon Feb  5 22:32:16 2007
+++ flac-1.1.4/src/flac/main.c	Thu Jun 28 16:00:05 2007
@@ -413,7 +413,10 @@
 			 * tags that we will set later, to avoid rewriting the
 			 * whole file.
 			 */
-			if(option_values.padding <= 0) {
+			if(option_values.padding == -1) {
+				/* Leave it alone; use the default. */
+			}
+			else if(option_values.padding <= 0) {
 				flac__utils_printf(stderr, 1, "NOTE: --replay-gain may leave a small PADDING block even with --no-padding\n");
 				option_values.padding = GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED;
 			}