summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/slice.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/mpegplayer/slice.c')
-rw-r--r--apps/plugins/mpegplayer/slice.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/plugins/mpegplayer/slice.c b/apps/plugins/mpegplayer/slice.c
index a98e85baa5..926333d5d0 100644
--- a/apps/plugins/mpegplayer/slice.c
+++ b/apps/plugins/mpegplayer/slice.c
@@ -20,6 +20,10 @@
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 *
24 * $Id$
25 * libmpeg2 sync history:
26 * 2008-07-01 - CVS revision 1.55
23 */ 27 */
24 28
25#include "plugin.h" 29#include "plugin.h"
@@ -488,7 +492,7 @@ static void get_intra_block_B14 (mpeg2_decoder_t * const decoder,
488 } 492 }
489 493
490 dest[63] ^= mismatch & 16; 494 dest[63] ^= mismatch & 16;
491 DUMPBITS (bit_buf, bits, 2); /* dump end of block code */ 495 DUMPBITS (bit_buf, bits, tab->len); /* dump end of block code */
492 decoder->bitstream_buf = bit_buf; 496 decoder->bitstream_buf = bit_buf;
493 decoder->bitstream_bits = bits; 497 decoder->bitstream_bits = bits;
494 decoder->bitstream_ptr = bit_ptr; 498 decoder->bitstream_ptr = bit_ptr;
@@ -601,7 +605,7 @@ static void get_intra_block_B15 (mpeg2_decoder_t * const decoder,
601 } 605 }
602 606
603 dest[63] ^= mismatch & 16; 607 dest[63] ^= mismatch & 16;
604 DUMPBITS (bit_buf, bits, 4); /* dump end of block code */ 608 DUMPBITS (bit_buf, bits, tab->len); /* dump end of block code */
605 decoder->bitstream_buf = bit_buf; 609 decoder->bitstream_buf = bit_buf;
606 decoder->bitstream_bits = bits; 610 decoder->bitstream_bits = bits;
607 decoder->bitstream_ptr = bit_ptr; 611 decoder->bitstream_ptr = bit_ptr;
@@ -728,7 +732,7 @@ static int get_non_intra_block (mpeg2_decoder_t * const decoder,
728 } 732 }
729 733
730 dest[63] ^= mismatch & 16; 734 dest[63] ^= mismatch & 16;
731 DUMPBITS (bit_buf, bits, 2); /* dump end of block code */ 735 DUMPBITS (bit_buf, bits, tab->len); /* dump end of block code */
732 decoder->bitstream_buf = bit_buf; 736 decoder->bitstream_buf = bit_buf;
733 decoder->bitstream_bits = bits; 737 decoder->bitstream_bits = bits;
734 decoder->bitstream_ptr = bit_ptr; 738 decoder->bitstream_ptr = bit_ptr;
@@ -852,7 +856,7 @@ static void get_mpeg1_intra_block (mpeg2_decoder_t * const decoder)
852 break; /* illegal, check needed to avoid buffer overflow */ 856 break; /* illegal, check needed to avoid buffer overflow */
853 } 857 }
854 858
855 DUMPBITS (bit_buf, bits, 2); /* dump end of block code */ 859 DUMPBITS (bit_buf, bits, tab->len); /* dump end of block code */
856 decoder->bitstream_buf = bit_buf; 860 decoder->bitstream_buf = bit_buf;
857 decoder->bitstream_bits = bits; 861 decoder->bitstream_bits = bits;
858 decoder->bitstream_ptr = bit_ptr; 862 decoder->bitstream_ptr = bit_ptr;
@@ -989,7 +993,7 @@ static int get_mpeg1_non_intra_block (mpeg2_decoder_t * const decoder)
989 break; /* illegal, check needed to avoid buffer overflow */ 993 break; /* illegal, check needed to avoid buffer overflow */
990 } 994 }
991 995
992 DUMPBITS (bit_buf, bits, 2); /* dump end of block code */ 996 DUMPBITS (bit_buf, bits, tab->len); /* dump end of block code */
993 decoder->bitstream_buf = bit_buf; 997 decoder->bitstream_buf = bit_buf;
994 decoder->bitstream_bits = bits; 998 decoder->bitstream_bits = bits;
995 decoder->bitstream_ptr = bit_ptr; 999 decoder->bitstream_ptr = bit_ptr;
@@ -1924,7 +1928,7 @@ static void skip_chroma_intra (mpeg2_decoder_t * const decoder)
1924 { \ 1928 { \
1925 table[4] (decoder->dest[1] + decoder->offset, \ 1929 table[4] (decoder->dest[1] + decoder->offset, \
1926 ref[1] + offset, decoder->stride, 16); \ 1930 ref[1] + offset, decoder->stride, 16); \
1927 table[4] (decoder->dest[2] + (decoder->offset >> 1), \ 1931 table[4] (decoder->dest[2] + decoder->offset, \
1928 ref[2] + offset, decoder->stride, 16); \ 1932 ref[2] + offset, decoder->stride, 16); \
1929 } 1933 }
1930 1934