← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavformat/txd.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/txd.c
21
21
 
22
22
#include "libavutil/intreadwrite.h"
23
23
#include "avformat.h"
 
24
#include "internal.h"
24
25
 
25
26
#define TXD_FILE            0x16
26
27
#define TXD_INFO            0x01
45
46
        return AVERROR(ENOMEM);
46
47
    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
47
48
    st->codec->codec_id = AV_CODEC_ID_TXD;
48
 
    st->codec->time_base.den = 5;
49
 
    st->codec->time_base.num = 1;
 
49
    avpriv_set_pts_info(st, 64, 1, 5);
 
50
    st->avg_frame_rate = av_inv_q(st->time_base);
50
51
    /* the parameters will be extracted from the compressed bitstream */
51
52
    return 0;
52
53
}