if (!par->codec_tag || par->codec_tag > 0xffff)
return -1;
+ if (par->codec_id == AV_CODEC_ID_ADPCM_SWF && par->block_align == 0) {
+ av_log(s, AV_LOG_ERROR, "%s can only be written to WAVE with a constant frame size\n",
+ avcodec_get_name(par->codec_id));
+ return AVERROR(EINVAL);
+ }
+
/* We use the known constant frame size for the codec if known, otherwise
* fall back on using AVCodecContext.frame_size, which is not as reliable
* for indicating packet duration. */
/* BITMAPINFOHEADER header */
void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par,
- int for_asf, int ignore_extradata)
+ int for_asf, int ignore_extradata, int rgb_frame_is_flipped)
{
- int keep_height = par->extradata_size >= 9 &&
- !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9);
- int extradata_size = par->extradata_size - 9*keep_height;
+ int flipped_extradata = (par->extradata_size >= 9 &&
+ !memcmp(par->extradata + par->extradata_size - 9, "BottomUp", 9));
+ int keep_height = flipped_extradata || rgb_frame_is_flipped;
+ int extradata_size = par->extradata_size - 9*flipped_extradata;
enum AVPixelFormat pix_fmt = par->format;
int pal_avi;