Mercurial > mplayer.hg
annotate libmpdemux/mpeg_hdr.h @ 24674:f6cf2c01315d
Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to normal PCM.
Make lavf demuxer set codec tag to AMVA in this case.
No need to use -ac +ffadpcmimaamva anymore.
author | voroshil |
---|---|
date | Wed, 03 Oct 2007 15:27:02 +0000 |
parents | df1d03939216 |
children | 328d1b36952a |
rev | line source |
---|---|
2565 | 1 |
2 typedef struct { | |
3 // video info: | |
4 int mpeg1; // 0=mpeg2 1=mpeg1 | |
5 int display_picture_width; | |
6 int display_picture_height; | |
7 int aspect_ratio_information; | |
8 int frame_rate_code; | |
16184
04dd5945fab8
100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
rfelker
parents:
15217
diff
changeset
|
9 float fps; |
2565 | 10 int bitrate; // 0x3FFFF==VBR |
11 // timing: | |
12 int picture_structure; | |
13 int progressive_sequence; | |
14 int repeat_first_field; | |
15 int progressive_frame; | |
16 int top_field_first; | |
17 int display_time; // secs*100 | |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
2565
diff
changeset
|
18 //the following are for mpeg4 |
15217 | 19 unsigned int timeinc_resolution, timeinc_bits, timeinc_unit; |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
2565
diff
changeset
|
20 int picture_type; |
2565 | 21 } mp_mpeg_header_t; |
22 | |
23 int mp_header_process_sequence_header (mp_mpeg_header_t * picture, unsigned char * buffer); | |
24 int mp_header_process_extension (mp_mpeg_header_t * picture, unsigned char * buffer); | |
18398
a1375e440e92
COSMETICS: moved code to parse mpeg1/2 A/R to mpeg_hdr.c
nicodvb
parents:
16184
diff
changeset
|
25 float mpeg12_aspect_info(mp_mpeg_header_t *picture); |
14477
92553e3c8f01
automatic fps calculation for mpeg4 in raw stream/mpeg-ts
nicodvb
parents:
2565
diff
changeset
|
26 int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer); |
14887 | 27 void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer); |
14798
0bd50330e688
framerate autodetection for H264 in raw/ts streams
nicodvb
parents:
14477
diff
changeset
|
28 int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len); |
21947 | 29 int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len); |