History

Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'

* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e': h263dec: call get_format() on resolution changes

Michael Niedermayer committed 12 years ago

Commit b9918a72 parents 40f2b16 c80a8161 file · +6 −0Browse files

Unified · Split

libavcodec/h263dec.c+6−0
@@ -548,6 +548,12 @@ retry: · 547 unmodified lines
548 548
549 if ((ret = ff_mpv_common_frame_size_change(s)))549 if ((ret = ff_mpv_common_frame_size_change(s)))
550 return ret;550 return ret;
551
552 if (avctx->pix_fmt != h263_get_format(avctx)) {
553 av_log(avctx, AV_LOG_ERROR, "format change not supported\n");
554 avctx->pix_fmt = AV_PIX_FMT_NONE;
555 return AVERROR_UNKNOWN;
556 }
551 }557 }
552 558
553 if (s->codec_id == AV_CODEC_ID_H263 ||559 if (s->codec_id == AV_CODEC_ID_H263 ||

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t