← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavformat/seek.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/seek.c
20
20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
21
 */
22
22
 
 
23
#include <stdint.h>
 
24
 
23
25
#include "seek.h"
24
26
#include "libavutil/mathematics.h"
25
27
#include "libavutil/mem.h"
428
430
        ss->parser        = st->parser;
429
431
        ss->last_IP_pts   = st->last_IP_pts;
430
432
        ss->cur_dts       = st->cur_dts;
431
 
        ss->reference_dts = st->reference_dts;
432
433
        ss->probe_packets = st->probe_packets;
433
434
 
434
435
        st->parser        = NULL;
435
436
        st->last_IP_pts   = AV_NOPTS_VALUE;
436
437
        st->cur_dts       = AV_NOPTS_VALUE;
437
 
        st->reference_dts = AV_NOPTS_VALUE;
438
438
        st->probe_packets = MAX_PROBE_PACKETS;
439
439
    }
440
440
 
467
467
        st->parser        = ss->parser;
468
468
        st->last_IP_pts   = ss->last_IP_pts;
469
469
        st->cur_dts       = ss->cur_dts;
470
 
        st->reference_dts = ss->reference_dts;
471
470
        st->probe_packets = ss->probe_packets;
472
471
    }
473
472