← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gstreamer0.10-ffmpeg/intrepid

« back to all changes in this revision

Viewing changes to gst-libs/ext/ffmpeg/libavformat/electronicarts.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-04-01 16:13:43 UTC
  • mto: (1.2.2 lenny)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20060401161343-n621cgjlujio0otg
Tags: upstream-0.10.1
Import upstream version 0.10.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/ffmpeg/libavformat/electronicarts.c
13
13
 *
14
14
 * You should have received a copy of the GNU Lesser General Public
15
15
 * License along with this library; if not, write to the Free Software
16
 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 */
18
18
 
19
19
/**
191
191
    st->codec->codec_type = CODEC_TYPE_VIDEO;
192
192
    st->codec->codec_id = CODEC_ID_EA_MJPEG;
193
193
    st->codec->codec_tag = 0;  /* no fourcc */
194
 
#endif    
 
194
#endif
195
195
 
196
196
    /* initialize the audio decoder stream */
197
197
    st = av_new_stream(s, 0);
243
243
                    pkt->pts *= ea->audio_frame_counter;
244
244
                    pkt->pts /= EA_SAMPLE_RATE;
245
245
 
246
 
                    /* 2 samples/byte, 1 or 2 samples per frame depending 
 
246
                    /* 2 samples/byte, 1 or 2 samples per frame depending
247
247
                     * on stereo; chunk also has 12-byte header */
248
248
                    ea->audio_frame_counter += ((chunk_size - 12) * 2) /
249
249
                        ea->num_channels;