summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 22:36:24 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 22:36:24 +0000
commit1d4b4b1d711282737f4ccd47d7a1b36abea9f0c3 (patch)
treeb491c41471399d8351c2ed703c73e1222b53231b /libmpcodecs
parent2483441486739fc4912cdf7110b86bd5a29910c2 (diff)
downloadmpv-1d4b4b1d711282737f4ccd47d7a1b36abea9f0c3.tar.bz2
mpv-1d4b4b1d711282737f4ccd47d7a1b36abea9f0c3.tar.xz
reinit codec chain when aspect ratio and/or resolution change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20121 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_mpegpes.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/libmpcodecs/vd_mpegpes.c b/libmpcodecs/vd_mpegpes.c
index 6ecac372ff..033df36fa6 100644
--- a/libmpcodecs/vd_mpegpes.c
+++ b/libmpcodecs/vd_mpegpes.c
@@ -3,6 +3,7 @@
#include "config.h"
#include "mp_msg.h"
+#include "libmpdemux/mpeg_hdr.h"
#include "vd_internal.h"
@@ -39,6 +40,22 @@ static void uninit(sh_video_t *sh){
static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
mp_image_t* mpi;
static vo_mpegpes_t packet;
+ mp_mpeg_header_t picture;
+ const unsigned char *d = data;
+
+ if(len>10 && !d[0] && !d[1] && d[2]==1 && d[3]==0xB3) {
+ float old_aspect = sh->aspect;
+ int oldw = sh->disp_w, oldh = sh->disp_h;
+ mp_header_process_sequence_header(&picture, &d[4]);
+ sh->aspect = mpeg12_aspect_info(&picture);
+ sh->disp_w = picture.display_picture_width;
+ sh->disp_h = picture.display_picture_height;
+ if(sh->aspect != old_aspect || sh->disp_w != oldw || sh->disp_h != oldh) {
+ if(!mpcodecs_config_vo(sh, sh->disp_w,sh->disp_h,IMGFMT_MPEGPES))
+ return 0;
+ }
+ }
+
mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h);
packet.data=data;
packet.size=len;