diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:55:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:56:43 +0200 |
| commit | efc08e00cc0b05ea478aef51693199bfb0c3b489 (patch) | |
| tree | 3d692a005e062de8485b540da1c763355c58b611 /libavformat/r3d.c | |
| parent | 39354d608933fe37a5ec86de4c691bcb46df0dac (diff) | |
| parent | b3ea76624ad1baab0b6bcc13f3f856be2f958110 (diff) | |
| download | ffmpeg-efc08e00cc0b05ea478aef51693199bfb0c3b489.tar.gz | |
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
* 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>
Diffstat (limited to 'libavformat/r3d.c')
| -rw-r--r-- | libavformat/r3d.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 3b3ecce3d9..8459cddc70 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define DEBUG - #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "libavutil/mathematics.h" |