Commit Graph

7 Commits

Author SHA1 Message Date
Michael Niedermayer
2a5f4c1ea2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

See: a0d13d84a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 11:11:34 +02:00
Michael Niedermayer
9027928522 Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 09:19:58 +02:00
Peter Ross
e6ef628b1e wtv: move duplicated guids into wtv.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:52:33 +01:00
Peter Ross
1701a22fce wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 15:51:41 +01:00
zhentan feng
42d4df06e1 WTV muxer (1_extract_wtv_common_code.patch) 2011-09-08 01:55:07 +02:00
zhentan feng
5edb23295e WTV: Add ff_ prefix to the moved fields.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 21:13:18 +02:00
zhentan feng
5ab826c165 WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file wtv.h and wtv.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 21:12:02 +02:00