← Back to branch summary

~ubuntu-branches/ubuntu/precise/mplayer2/precise-proposed

~ubuntu-branches/ubuntu/precise/mplayer2/precise-proposed

« back to all changes in this revision

Viewing changes to libmpdemux/demux_mpg.c

Committer: Package Import Robot
Author(s): Reinhard Tartler
Date: 2012-01-12 22:59:30 UTC
mfrom: (5.1.8 sid)
Revision ID: package-import@ubuntu.com-20120112225930-jsg10o7na7nk73w5

Tags: 2.0-426-gc32b3ed-2

* Upload to unstable
* don't build-depend on libcdparanoia-dev on the hurd

files added:
debian/mime

libao2/ao_rsound.c

libmpdemux/demux_packet.h

libvo/cocoa_common.h

libvo/cocoa_common.m

screenshot.c

screenshot.h

files removed:
.pc

.pc/.version

.pc/0001-new_libbluray_api.patch

.pc/0001-new_libbluray_api.patch/configure

.pc/0001-new_libbluray_api.patch/stream

.pc/0001-new_libbluray_api.patch/stream/stream_bluray.c

.pc/0002-CVE-2011-3625.patch

.pc/0002-CVE-2011-3625.patch/sub

.pc/0002-CVE-2011-3625.patch/sub/subreader.c

.pc/applied-patches

debian/patches

debian/patches/0001-new_libbluray_api.patch

debian/patches/0002-CVE-2011-3625.patch

debian/patches/series

etc/dvb-menu.conf

etc/menu.conf

libmenu

libmenu/menu.c

libmenu/menu.h

libmenu/menu_chapsel.c

libmenu/menu_cmdlist.c

libmenu/menu_console.c

libmenu/menu_dvbin.c

libmenu/menu_filesel.c

libmenu/menu_list.c

libmenu/menu_list.h

libmenu/menu_param.c

libmenu/menu_pt.c

libmenu/menu_txt.c

libmenu/vf_menu.c

libmpcodecs/vd_ffmpeg.h

libvo/aspecttest.c

libvo/matrixview.c

libvo/matrixview.h

libvo/vo_gl2.c

libvo/vo_matrixview.c

files modified:
DOCS/man/en/mplayer.1

DOCS/tech/slave.txt

Makefile

TOOLS/vdpau_functions.py

access_mpcontext.h

asxparser.c

av_log.c

av_log.h

bstr.c

bstr.h

cfg-mplayer.h

codec-cfg.c

command.c

configure

cpudetect.c

debian/changelog

debian/control

debian/gbp.conf

defaultopts.c

etc/codecs.conf

etc/input.conf

etc/mplayer.desktop

ffmpeg_files/taglists.c

fmt-conversion.c

input/ar.c

input/ar.h

input/input.c

input/input.h

input/keycodes.h

input/lirc.c

input/lirc.h

libaf/af.c

libaf/af_lavcac3enc.c

libaf/format.c

libao2/ao_coreaudio.c

libao2/ao_ivtv.c

libao2/ao_mpegpes.c

libao2/ao_pcm.c

libao2/ao_v4l2.c

libao2/audio_out.c

libao2/audio_out.h

libmpcodecs/ad.c

libmpcodecs/ad.h

libmpcodecs/ad_ffmpeg.c

libmpcodecs/dec_audio.c

libmpcodecs/dec_audio.h

libmpcodecs/dec_video.c

libmpcodecs/dec_video.h

libmpcodecs/img_format.c

libmpcodecs/img_format.h

libmpcodecs/mp_image.c

libmpcodecs/mpc_info.h

libmpcodecs/vd.c

libmpcodecs/vd.h

libmpcodecs/vd_ffmpeg.c

libmpcodecs/vd_xanim.c

libmpcodecs/vf.c

libmpcodecs/vf.h

libmpcodecs/vf_ass.c

libmpcodecs/vf_delogo.c

libmpcodecs/vf_dint.c

libmpcodecs/vf_divtc.c

libmpcodecs/vf_dsize.c

libmpcodecs/vf_expand.c

libmpcodecs/vf_fspp.c

libmpcodecs/vf_ilpack.c

libmpcodecs/vf_lavc.c

libmpcodecs/vf_lavcdeint.c

libmpcodecs/vf_mcdeint.c

libmpcodecs/vf_pullup.c

libmpcodecs/vf_qp.c

libmpcodecs/vf_sab.c

libmpcodecs/vf_scale.c

libmpcodecs/vf_scale.h

libmpcodecs/vf_screenshot.c

libmpcodecs/vf_smartblur.c

libmpcodecs/vf_spp.c

libmpcodecs/vf_stereo3d.c

libmpcodecs/vf_uspp.c

libmpcodecs/vf_vo.c

libmpcodecs/vf_yadif.c

libmpcodecs/vfcap.h

libmpdemux/asf.h

libmpdemux/asfheader.c

libmpdemux/aviheader.c

libmpdemux/aviheader.h

libmpdemux/demux_asf.c

libmpdemux/demux_demuxers.c

libmpdemux/demux_lavf.c

libmpdemux/demux_mf.c

libmpdemux/demux_mkv.c

libmpdemux/demux_mpg.c

libmpdemux/demux_nsv.c

libmpdemux/demux_ogg.c

libmpdemux/demux_real.c

libmpdemux/demux_rtp.cpp

libmpdemux/demux_rtp_codec.cpp

libmpdemux/demux_rtp_internal.h

libmpdemux/demux_ts.c

libmpdemux/demux_viv.c

libmpdemux/demux_vqf.c

libmpdemux/demuxer.c

libmpdemux/demuxer.h

libmpdemux/mp_taglists.c

libmpdemux/mpeg_hdr.c

libmpdemux/stheader.h

libvo/aspect.c

libvo/csputils.c

libvo/csputils.h

libvo/gl_common.c

libvo/gl_common.h

libvo/mga_template.c

libvo/old_vo_wrapper.c

libvo/old_vo_wrapper.h

libvo/sdl_common.c

libvo/sdl_common.h

libvo/vdpau_template.c

libvo/video_out.c

libvo/video_out.h

libvo/vo_corevideo.m

libvo/vo_dfbmga.c

libvo/vo_direct3d.c

libvo/vo_directfb2.c

libvo/vo_directx.c

libvo/vo_gl.c

libvo/vo_jpeg.c

libvo/vo_mpegpes.c

libvo/vo_png.c

libvo/vo_s3fb.c

libvo/vo_vdpau.c

libvo/vo_x11.c

libvo/vo_xv.c

libvo/w32_common.c

libvo/wskeys.h

libvo/x11_common.c

libvo/x11_common.h

loader/module.c

m_config.c

m_config.h

m_option.c

m_option.h

m_property.c

m_struct.c

m_struct.h

mp_core.h

mp_fifo.c

mp_fifo.h

mp_msg.h

mplayer.c

options.h

osdep/getch2.c

osdep/macosx_finder_args.c

osdep/mplayer.rc

osdep/setenv.c

parser-cfg.c

parser-cfg.h

parser-mpcmd.c

parser-mpcmd.h

path.c

playtree.c

playtree.h

playtreeparser.c

playtreeparser.h

rpm/mplayer.spec

stream/cache2.c

stream/http.c

stream/network.c

stream/realrtsp/real.c

stream/stream.c

stream/stream.h

stream/stream_cdda.c

stream/stream_cddb.c

stream/stream_cue.c

stream/stream_dvd.c

stream/stream_dvdnav.c

stream/stream_ffmpeg.c

stream/stream_pvr.c

stream/tvi_dshow.c

stream/tvi_v4l.c

stream/tvi_v4l2.c

stream/vcd_read_darwin.h

stream/vcd_read_fbsd.h

stream/vcd_read_os2.h

stream/vcd_read_win32.h

sub/ass_mp.c

sub/ass_mp.h

sub/av_sub.c

sub/find_subfiles.c

sub/sd_ass.c

sub/sub.c

sub/sub.h

sub/subassconvert.c

sub/subreader.c

sub/vobsub.c

subopt-helper.c

talloc.c

talloc.h

timeline/tl_edl.c

timeline/tl_matroska.c

Show diffs side-by-side

added added

removed removed

libmpdemux/demux_mpg.c

261

261

return 0; // invalid pts

262

262

}

263

263

pts=(((uint64_t)((c>>1)&7))<<30)|((d>>1)<<15)|(e>>1);

264

mp_dbg(MSGT_DEMUX,MSGL_DBG3," pts {%"PRIu64"}",pts);

264

mp_dbg(MSGT_DEMUX,MSGL_DBG3," pts {%llu}",pts);

265

265

return pts;

266

266

}

267

267

Older »