Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

Browse Source 
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/18/head
Michael Niedermayer 12 years ago
parent 39354d6089 b3ea76624a
commit efc08e00cc
40 changed files with 13 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/4xm.c
  2. 2
      libavcodec/ac3enc.c
  3. 4
      libavcodec/alsdec.c
  4. 3
      libavcodec/dnxhddec.c
  5. 1
      libavcodec/dnxhdenc.c
  6. 3
      libavcodec/dsputil.h
  7. 2
      libavcodec/dvdsubdec.c
  8. 2
      libavcodec/gifdec.c
  9. 3
      libavcodec/h263.c
  10. 2
      libavcodec/h263dec.c
  11. 2
      libavcodec/ituh263dec.c
  12. 1
      libavcodec/ituh263enc.c
  13. 2
      libavcodec/mpeg12.c
  14. 1
      libavcodec/mpeg12dec.c
  15. 1
      libavcodec/mpegaudiodecheader.c
  16. 6
      libavcodec/mpegvideo.c
  17. 5
      libavcodec/mpegvideo_enc.c
  18. 1
      libavcodec/msmpeg4.c
  19. 2
      libavcodec/pngdec.c
  20. 2
      libavcodec/pngenc.c
  21. 2
      libavcodec/rv10.c
  22. 2
      libavcodec/rv34.c
  23. 1
      libavcodec/tta.c
  24. 2
      libavdevice/fbdev.c
  25. 2
      libavfilter/src_movie.c
  26. 24
      libavfilter/vf_aspect.c
  27. 2
      libavfilter/vf_crop.c
  28. 2
      libavfilter/vf_frei0r.c
  29. 2
      libavfilter/vf_libopencv.c
  30. 2
      libavformat/asfdec.c
  31. 2
      libavformat/isom.c
  32. 1
      libavformat/mov.c
  33. 2
      libavformat/mux.c
  34. 2
      libavformat/mxfdec.c
  35. 2
      libavformat/mxfenc.c
  36. 2
      libavformat/r3d.c
  37. 2
      libavformat/rtmpproto.c
  38. 2
      libavformat/rtpenc.c
  39. 2
      libavformat/rtsp.c
  40. 2
      libavformat/utils.c

2
libavcodec/4xm.c
Unescape View File

@ -24,6 +24,7 @@
* 4XM codec. * 4XM codec.
*/ */
#include "libavutil/avassert.h"
#include "libavutil/frame.h" #include "libavutil/frame.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
@ -32,7 +33,6 @@
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "libavutil/avassert.h"
#define BLOCK_TYPE_VLC_BITS 5 #define BLOCK_TYPE_VLC_BITS 5
#define ACDC_VLC_BITS 9 #define ACDC_VLC_BITS 9

2
libavcodec/ac3enc.c
Unescape View File

@ -26,8 +26,6 @@
* The simplest AC-3 encoder. * The simplest AC-3 encoder.
*/ */
//#define ASSERT_LEVEL 2
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

4
libavcodec/alsdec.c
Unescape View File

@ -25,10 +25,6 @@
* @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
*/ */
//#define DEBUG
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "unary.h" #include "unary.h"

3
libavcodec/dnxhddec.c
Unescape View File

@ -22,9 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define TRACE
//#define DEBUG
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"

1
libavcodec/dnxhdenc.c
Unescape View File

@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define DEBUG
#define RC_VARIANCE 1 // use variance or ssd for fast rc #define RC_VARIANCE 1 // use variance or ssd for fast rc
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

3
libavcodec/dsputil.h
Unescape View File

@ -34,9 +34,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "rnd_avg.h" #include "rnd_avg.h"
//#define DEBUG
/* encoding scans */ /* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_horizontal_scan[64];
extern const uint8_t ff_alternate_vertical_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64];

2
libavcodec/dvdsubdec.c
Unescape View File

@ -27,8 +27,6 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
//#define DEBUG
typedef struct DVDSubContext typedef struct DVDSubContext
{ {
AVClass *class; AVClass *class;

2
libavcodec/gifdec.c
Unescape View File

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define DEBUG
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"

3
libavcodec/h263.c
Unescape View File

@ -27,7 +27,6 @@
* h263/mpeg4 codec. * h263/mpeg4 codec.
*/ */
//#define DEBUG
#include <limits.h> #include <limits.h>
#include "avcodec.h" #include "avcodec.h"
@ -39,8 +38,6 @@
#include "flv.h" #include "flv.h"
#include "mpeg4video.h" #include "mpeg4video.h"
//#undef NDEBUG
//#include <assert.h>
uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

2
libavcodec/h263dec.c
Unescape View File

@ -41,8 +41,6 @@
#include "flv.h" #include "flv.h"
#include "mpeg4video.h" #include "mpeg4video.h"
//#define DEBUG
av_cold int ff_h263_decode_init(AVCodecContext *avctx) av_cold int ff_h263_decode_init(AVCodecContext *avctx)
{ {
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;

2
libavcodec/ituh263dec.c
Unescape View File

@ -28,8 +28,6 @@
*/ */
#define UNCHECKED_BITSTREAM_READER 1 #define UNCHECKED_BITSTREAM_READER 1
//#define DEBUG
#include <limits.h> #include <limits.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

1
libavcodec/ituh263enc.c
Unescape View File

@ -27,7 +27,6 @@
* h263 bitstream encoder. * h263 bitstream encoder.
*/ */
//#define DEBUG
#include <limits.h> #include <limits.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

2
libavcodec/mpeg12.c
Unescape View File

@ -27,7 +27,6 @@
#define UNCHECKED_BITSTREAM_READER 1 #define UNCHECKED_BITSTREAM_READER 1
//#define DEBUG
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/timecode.h" #include "libavutil/timecode.h"
@ -45,7 +44,6 @@
#include "xvmc_internal.h" #include "xvmc_internal.h"
#include "thread.h" #include "thread.h"
uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
#define INIT_2D_VLC_RL(rl, static_size)\ #define INIT_2D_VLC_RL(rl, static_size)\

1
libavcodec/mpeg12dec.c
Unescape View File

@ -25,7 +25,6 @@
* MPEG-1/2 decoder * MPEG-1/2 decoder
*/ */
//#define DEBUG
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "internal.h" #include "internal.h"

1
libavcodec/mpegaudiodecheader.c
Unescape View File

@ -24,7 +24,6 @@
* MPEG Audio header decoder. * MPEG Audio header decoder.
*/ */
//#define DEBUG
#include "avcodec.h" #include "avcodec.h"
#include "mpegaudio.h" #include "mpegaudio.h"
#include "mpegaudiodata.h" #include "mpegaudiodata.h"

6
libavcodec/mpegvideo.c
Unescape View File

@ -42,9 +42,6 @@
#include "thread.h" #include "thread.h"
#include <limits.h> #include <limits.h>
//#undef NDEBUG
//#include <assert.h>
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
int16_t *block, int n, int qscale); int16_t *block, int n, int qscale);
static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
@ -60,9 +57,6 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
static void dct_unquantize_h263_inter_c(MpegEncContext *s, static void dct_unquantize_h263_inter_c(MpegEncContext *s,
int16_t *block, int n, int qscale); int16_t *block, int n, int qscale);
//#define DEBUG
static const uint8_t ff_default_chroma_qscale_table[32] = { static const uint8_t ff_default_chroma_qscale_table[32] = {
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,

5
libavcodec/mpegvideo_enc.c
Unescape View File

@ -52,17 +52,12 @@
#include <limits.h> #include <limits.h>
#include "sp5x.h" #include "sp5x.h"
//#undef NDEBUG
//#include <assert.h>
static int encode_picture(MpegEncContext *s, int picture_number); static int encode_picture(MpegEncContext *s, int picture_number);
static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
static int sse_mb(MpegEncContext *s); static int sse_mb(MpegEncContext *s);
static void denoise_dct_c(MpegEncContext *s, int16_t *block); static void denoise_dct_c(MpegEncContext *s, int16_t *block);
static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow);
//#define DEBUG
static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1]; static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
static uint8_t default_fcode_tab[MAX_MV * 2 + 1]; static uint8_t default_fcode_tab[MAX_MV * 2 + 1];

1
libavcodec/msmpeg4.c
Unescape View File

@ -45,7 +45,6 @@
* - (encoding) select best mv table (two choices) * - (encoding) select best mv table (two choices)
* - (encoding) select best vlc/dc table * - (encoding) select best vlc/dc table
*/ */
//#define DEBUG
/* This table is practically identical to the one from h263 /* This table is practically identical to the one from h263
* except that it is inverted. */ * except that it is inverted. */

2
libavcodec/pngdec.c
Unescape View File

@ -35,8 +35,6 @@
#include <zlib.h> #include <zlib.h>
//#define DEBUG
typedef struct PNGDecContext { typedef struct PNGDecContext {
PNGDSPContext dsp; PNGDSPContext dsp;
AVCodecContext *avctx; AVCodecContext *avctx;

2
libavcodec/pngenc.c
Unescape View File

@ -33,8 +33,6 @@
#include <zlib.h> #include <zlib.h>
//#define DEBUG
#define IOBUF_SIZE 4096 #define IOBUF_SIZE 4096
typedef struct PNGEncContext { typedef struct PNGEncContext {

2
libavcodec/rv10.c
Unescape View File

@ -32,8 +32,6 @@
#include "mpeg4video.h" #include "mpeg4video.h"
#include "h263.h" #include "h263.h"
//#define DEBUG
#define RV_GET_MAJOR_VER(x) ((x) >> 28) #define RV_GET_MAJOR_VER(x) ((x) >> 28)
#define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF) #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)
#define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF) #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF)

2
libavcodec/rv34.c
Unescape View File

@ -40,8 +40,6 @@
#include "rv34data.h" #include "rv34data.h"
#include "rv34.h" #include "rv34.h"
//#define DEBUG
static inline void ZERO8x2(void* dst, int stride) static inline void ZERO8x2(void* dst, int stride)
{ {
fill_rectangle(dst, 1, 2, stride, 0, 4); fill_rectangle(dst, 1, 2, stride, 0, 4);

1
libavcodec/tta.c
Unescape View File

@ -28,7 +28,6 @@
*/ */
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
//#define DEBUG
#include <limits.h> #include <limits.h>
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"

2
libavdevice/fbdev.c
Unescape View File

@ -27,8 +27,6 @@
* @see http://linux-fbdev.sourceforge.net/ * @see http://linux-fbdev.sourceforge.net/
*/ */
/* #define DEBUG */
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

2
libavfilter/src_movie.c
Unescape View File

@ -27,8 +27,6 @@
* @todo support a PTS correction mechanism * @todo support a PTS correction mechanism
*/ */
/* #define DEBUG */
#include <float.h> #include <float.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

24
libavfilter/vf_aspect.c
Unescape View File

@ -77,9 +77,9 @@ static av_cold int init(AVFilterContext *ctx)
static int filter_frame(AVFilterLink *link, AVFrame *frame) static int filter_frame(AVFilterLink *link, AVFrame *frame)
{ {
AspectContext *aspect = link->dst->priv; AspectContext *s = link->dst->priv;
frame->sample_aspect_ratio = aspect->aspect; frame->sample_aspect_ratio = s->aspect;
return ff_filter_frame(link->dst->outputs[0], frame); return ff_filter_frame(link->dst->outputs[0], frame);
} }
@ -99,15 +99,15 @@ static inline void compute_dar(AVRational *dar, AVRational sar, int w, int h)
static int setdar_config_props(AVFilterLink *inlink) static int setdar_config_props(AVFilterLink *inlink)
{ {
AspectContext *aspect = inlink->dst->priv; AspectContext *s = inlink->dst->priv;
AVRational dar = aspect->aspect, old_dar; AVRational dar = s->aspect, old_dar;
AVRational old_sar = inlink->sample_aspect_ratio; AVRational old_sar = inlink->sample_aspect_ratio;
if (aspect->aspect.num && aspect->aspect.den) { if (s->aspect.num && s->aspect.den) {
av_reduce(&aspect->aspect.num, &aspect->aspect.den, av_reduce(&s->aspect.num, &s->aspect.den,
aspect->aspect.num * inlink->h, s->aspect.num * inlink->h,
aspect->aspect.den * inlink->w, INT_MAX); s->aspect.den * inlink->w, INT_MAX);
inlink->sample_aspect_ratio = aspect->aspect; inlink->sample_aspect_ratio = s->aspect;
} else { } else {
inlink->sample_aspect_ratio = (AVRational){ 1, 1 }; inlink->sample_aspect_ratio = (AVRational){ 1, 1 };
dar = (AVRational){ inlink->w, inlink->h }; dar = (AVRational){ inlink->w, inlink->h };
@ -171,14 +171,14 @@ AVFilter avfilter_vf_setdar = {
static int setsar_config_props(AVFilterLink *inlink) static int setsar_config_props(AVFilterLink *inlink)
{ {
AspectContext *aspect = inlink->dst->priv; AspectContext *s = inlink->dst->priv;
AVRational old_sar = inlink->sample_aspect_ratio; AVRational old_sar = inlink->sample_aspect_ratio;
AVRational old_dar, dar; AVRational old_dar, dar;
inlink->sample_aspect_ratio = aspect->aspect; inlink->sample_aspect_ratio = s->aspect;
compute_dar(&old_dar, old_sar, inlink->w, inlink->h); compute_dar(&old_dar, old_sar, inlink->w, inlink->h);
compute_dar(&dar, aspect->aspect, inlink->w, inlink->h); compute_dar(&dar, s->aspect, inlink->w, inlink->h);
av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n", av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n",
inlink->w, inlink->h, old_sar.num, old_sar.den, old_dar.num, old_dar.den, inlink->w, inlink->h, old_sar.num, old_sar.den, old_dar.num, old_dar.den,
inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, dar.num, dar.den); inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, dar.num, dar.den);

2
libavfilter/vf_crop.c
Unescape View File

@ -23,8 +23,6 @@
* video crop filter * video crop filter
*/ */
/* #define DEBUG */
#include <stdio.h> #include <stdio.h>
#include "avfilter.h" #include "avfilter.h"

2
libavfilter/vf_frei0r.c
Unescape View File

@ -22,8 +22,6 @@
* frei0r wrapper * frei0r wrapper
*/ */
/* #define DEBUG */
#include <dlfcn.h> #include <dlfcn.h>
#include <frei0r.h> #include <frei0r.h>
#include <stdio.h> #include <stdio.h>

2
libavfilter/vf_libopencv.c
Unescape View File

@ -23,8 +23,6 @@
* libopencv wrapper functions * libopencv wrapper functions
*/ */
/* #define DEBUG */
#include <opencv/cv.h> #include <opencv/cv.h>
#include <opencv/cxcore.h> #include <opencv/cxcore.h>
#include "libavutil/avstring.h" #include "libavutil/avstring.h"

2
libavformat/asfdec.c
Unescape View File

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define DEBUG
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"

2
libavformat/isom.c
Unescape View File

@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define DEBUG
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "isom.h" #include "isom.h"

1
libavformat/mov.c
Unescape View File

@ -25,7 +25,6 @@
#include <limits.h> #include <limits.h>
//#define DEBUG
//#define MOV_EXPORT_ALL_METADATA //#define MOV_EXPORT_ALL_METADATA
#include "libavutil/attributes.h" #include "libavutil/attributes.h"

2
libavformat/mux.c
Unescape View File

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* #define DEBUG */
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"

2
libavformat/mxfdec.c
Unescape View File

@ -43,8 +43,6 @@
* Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1 * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
*/ */
//#define DEBUG
#include "libavutil/aes.h" #include "libavutil/aes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"

2
libavformat/mxfenc.c
Unescape View File

@ -30,8 +30,6 @@
* SMPTE RP224: Registry of SMPTE Universal Labels * SMPTE RP224: Registry of SMPTE Universal Labels
*/ */
//#define DEBUG
#include <inttypes.h> #include <inttypes.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>

2
libavformat/r3d.c
Unescape View File

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//#define DEBUG
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"

2
libavformat/rtmpproto.c
Unescape View File

@ -48,8 +48,6 @@
#include <zlib.h> #include <zlib.h>
#endif #endif
//#define DEBUG
#define APP_MAX_LENGTH 1024 #define APP_MAX_LENGTH 1024
#define PLAYPATH_MAX_LENGTH 256 #define PLAYPATH_MAX_LENGTH 256
#define TCURL_MAX_LENGTH 512 #define TCURL_MAX_LENGTH 512

2
libavformat/rtpenc.c
Unescape View File

@ -28,8 +28,6 @@
#include "rtpenc.h" #include "rtpenc.h"
//#define DEBUG
static const AVOption options[] = { static const AVOption options[] = {
FF_RTP_FLAG_OPTS(RTPMuxContext, flags), FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
{ "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM }, { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },

2
libavformat/rtsp.c
Unescape View File

@ -49,8 +49,6 @@
#include "rtpenc.h" #include "rtpenc.h"
#include "mpegts.h" #include "mpegts.h"
//#define DEBUG
/* Timeout values for socket poll, in ms, /* Timeout values for socket poll, in ms,
* and read_packet(), in seconds */ * and read_packet(), in seconds */
#define POLL_TIMEOUT_MS 100 #define POLL_TIMEOUT_MS 100

2
libavformat/utils.c
Unescape View File

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* #define DEBUG */
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"

Write Preview
Loading…
Cancel
Save