aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-29 00:20:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-29 00:20:29 +0100
commit4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch)
tree694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavformat/mpeg.c
parent4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff)
parentac47e014bbaf5163871a8beb7522015e0bc27615 (diff)
downloadffmpeg-4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
-rw-r--r--libavformat/mpeg.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 5b72c93c2c..de2dd9dfbe 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -620,7 +620,6 @@ AVInputFormat ff_mpegps_demuxer = {
.read_probe = mpegps_probe,
.read_header = mpegps_read_header,
.read_packet = mpegps_read_packet,
- .read_seek = NULL, //mpegps_read_seek,
.read_timestamp = mpegps_read_dts,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};