aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-07-21 22:46:47 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-07-21 22:46:47 +0000
commit6aaff88fd9b128128d416934db6175f443bacc7e (patch)
tree05400003157be6c5f1578cd7053869d22e8ba269
parentc32867b5b604b9d39c72014a380aafedb8681f40 (diff)
downloadffmpeg-6aaff88fd9b128128d416934db6175f443bacc7e.tar.gz
Revert r13542: Spatial direct mode probably also works with PAFF.
Originally committed as revision 14332 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e429f860b0..06d4947a69 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4117,8 +4117,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(h->slice_type_nos != FF_I_TYPE){
if(h->slice_type_nos == FF_B_TYPE){
h->direct_spatial_mv_pred= get_bits1(&s->gb);
- if(FIELD_PICTURE && h->direct_spatial_mv_pred)
- av_log(h->s.avctx, AV_LOG_ERROR, "PAFF + spatial direct mode is not implemented\n");
}
num_ref_idx_active_override_flag= get_bits1(&s->gb);