[FFmpeg-cvslog] ffmpeg: avoid apics for video output if possible

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 26 00:02:19 2012 +0200| [de73ae6b1a3ff0398988dc683f94ea07e3bb1372] | committer: Michael Niedermayer

ffmpeg: avoid apics for video output if possible

Fixes Ticket1714

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de73ae6b1a3ff0398988dc683f94ea07e3bb1372
---

 ffmpeg_opt.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 076852d..3d73564 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1499,6 +1499,8 @@ void opt_output_file(void *optctx, const char *filename)
                 int new_area;
                 ist = input_streams[i];
                 new_area = ist->st->codec->width * ist->st->codec->height;
+                if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
+                    new_area = 1;
                 if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
                     new_area > area) {
                     if((qcr==MKTAG('A', 'P', 'I', 'C')) && !(ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))