Permalink
Browse files

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
	tests/rotozoom.c
	tests/videogen.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
2 parents b4d4436 + a8656cd commit 67732b9d62576c67589773e5332e94aac429cc4c @michaelni michaelni committed Jun 7, 2012
Showing with 14 additions and 20 deletions.
  1. +0 −8 libavformat/mpegts.c
  2. +2 −2 tests/Makefile
  3. +6 −5 tests/rotozoom.c
  4. +6 −5 tests/videogen.c
@@ -1868,7 +1868,6 @@ static int handle_packets(MpegTSContext *ts, int nb_packets)
static int mpegts_probe(AVProbeData *p)
{
-#if 1
const int size= p->buf_size;
int score, fec_score, dvhs_score;
int check_count= size / TS_FEC_PACKET_SIZE;
@@ -1887,13 +1886,6 @@ static int mpegts_probe(AVProbeData *p)
else if(dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT;
else if( fec_score > 6) return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT;
else return -1;
-#else
- /* only use the extension for safer guess */
- if (av_match_ext(p->filename, "ts"))
- return AVPROBE_SCORE_MAX;
- else
- return 0;
-#endif
}
/* return the 90kHz PCR and the extension for the 27MHz PCR. return
View
@@ -28,10 +28,10 @@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
$(M)./$< $@ $(subst -, ,$*)
tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
- $(M)$< >$@
+ $(M)$< $@
tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
- $(M)$< $(SRC_PATH)/tests/lena.pnm >$@
+ $(M)$< $(SRC_PATH)/tests/lena.pnm $@
tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
View
@@ -158,15 +158,16 @@ int main(int argc, char **argv)
{
int w, h, i;
char buf[1024];
+ int isdir = 0;
- if (argc > 3) {
- printf("usage: %s image.pnm [directory/]\n"
+ if (argc != 3) {
+ printf("usage: %s image.pnm file|dir\n"
"generate a test video stream\n", argv[0]);
return 1;
}
-// if (argc < 3)
-// err_if(!freopen(NULL, "wb", stdout));
+ if (!freopen(argv[2], "wb", stdout))
+ isdir = 1;
w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT;
@@ -181,7 +182,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h);
- if (argc > 2) {
+ if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[2], i);
pgmyuv_save(buf, w, h, rgb_tab);
} else {
View
@@ -145,15 +145,16 @@ int main(int argc, char **argv)
{
int w, h, i;
char buf[1024];
+ int isdir = 0;
- if (argc > 2) {
- printf("usage: %s [file]\n"
+ if (argc != 2) {
+ printf("usage: %s file|dir\n"
"generate a test video stream\n", argv[0]);
exit(1);
}
-// if (argc < 2)
-// err_if(!freopen(NULL, "wb", stdout));
+ if (!freopen(argv[1], "wb", stdout))
+ isdir = 1;
w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT;
@@ -165,7 +166,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h);
- if (argc > 1) {
+ if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
pgmyuv_save(buf, w, h, rgb_tab);
} else {

0 comments on commit 67732b9

Please sign in to comment.