summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_ps.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-30 10:31:14 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-30 10:46:50 +0200
commit66624cbb80e3895d68b5e2d897a94b11dc666c0e (patch)
treedc7a4ceb53ee87dfc9cb1ecf1bf4beeb6fc5b61f /libavcodec/h264_ps.c
parentc70e8523af8f4361cc7dc4600246fc8fc13731fa (diff)
downloadffmpeg-streaming-66624cbb80e3895d68b5e2d897a94b11dc666c0e.zip
ffmpeg-streaming-66624cbb80e3895d68b5e2d897a94b11dc666c0e.tar.gz
Disable cropping for the brainfart case.
This fixes ticket #348 for the few users who have a playback application that supports Sisvel 3D. The other 99% have to wait until FFmpeg supports arbitrary cropping.
Diffstat (limited to 'libavcodec/h264_ps.c')
-rw-r--r--libavcodec/h264_ps.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index fa99372..ba16e1c 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -406,7 +406,14 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ... (left: %d, top: %d)\n", sps->crop_left, sps->crop_top);
}
if(sps->crop_right >= crop_horizontal_limit || sps->crop_bottom >= crop_vertical_limit){
- av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ... (right: %d, bottom: %d)\n", sps->crop_right, sps->crop_bottom);
+ av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, cropping disabled (right: %d, bottom: %d)\n", sps->crop_right, sps->crop_bottom);
+ /* It is very unlikely that partial cropping will make anybody happy.
+ * Not cropping at all fixes for example playback of Sisvel 3D streams
+ * in applications supporting Sisvel 3D. */
+ sps->crop_left =
+ sps->crop_right =
+ sps->crop_top =
+ sps->crop_bottom= 0;
}
}else{
sps->crop_left =
OpenPOWER on IntegriCloud