headers
pross | 1 Jan 2011 04:24
Picon

r26182 - trunk/libavformat/riff.c

Author: pross
Date: Sat Jan  1 04:24:10 2011
New Revision: 26182

Log:
move ff_get_bmp_header under CONFIG_DEMUXERS block

Modified:
   trunk/libavformat/riff.c

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	Sat Jan  1 00:22:08 2011	(r26181)
+++ trunk/libavformat/riff.c	Sat Jan  1 04:24:10 2011	(r26182)
 <at>  <at>  -444,23 +444,6  <at>  <at>  int ff_put_wav_header(ByteIOContext *pb,
     return hdrsize;
 }

-int ff_get_bmp_header(ByteIOContext *pb, AVStream *st)
-{
-    int tag1;
-    get_le32(pb); /* size */
-    st->codec->width = get_le32(pb);
-    st->codec->height = (int32_t)get_le32(pb);
-    get_le16(pb); /* planes */
-    st->codec->bits_per_coded_sample= get_le16(pb); /* depth */
-    tag1 = get_le32(pb);
-    get_le32(pb); /* ImageSize */
-    get_le32(pb); /* XPelsPerMeter */
-    get_le32(pb); /* YPelsPerMeter */
(Continue reading)

Permalink | Reply | 0 comments |
headers
Vitor Sessak | 1 Jan 2011 12:29
Picon

Re: r26119 - in trunk: Changelog MAINTAINERS doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/ass.c libavcodec/ass.h libavcodec/avcodec.h libavcodec/srtdec.c tests/fate.mak tests/...

On 12/31/2010 01:08 AM, Aurelien Jacobs wrote:
> On Thu, Dec 30, 2010 at 09:19:46AM +0100, Vitor Sessak wrote:
>> On 12/29/2010 12:52 AM, aurel wrote:
>>> Author: aurel
>>> Date: Wed Dec 29 00:52:53 2010
>>> New Revision: 26119
>>>
>>> Log:
>>> add SubRip decoder
>>
>> The FATE valgrind box detect some leaks in this decoder, see
>> http://fate.ffmpeg.org/x86_32-linux-gcc-valgrind/20101230053704 .
>
> Thanks for noticing ! FATE is really very helpful !
> Should be fixed now.

Nice, thanks for the fix! BTW, adding new tests for subtitle formats are 
very welcome!

-Vitor
Permalink | Reply | 0 comments |
headers
stefano | 1 Jan 2011 12:47
Picon

r26183 - trunk/libavcodec/avcodec.h

Author: stefano
Date: Sat Jan  1 12:47:51 2011
New Revision: 26183

Log:
Fix typos.

Modified:
   trunk/libavcodec/avcodec.h

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Sat Jan  1 04:24:10 2011	(r26182)
+++ trunk/libavcodec/avcodec.h	Sat Jan  1 12:47:51 2011	(r26183)
 <at>  <at>  -992,11 +992,11  <at>  <at>  typedef struct AVPanScan{
     int8_t *ref_index[2];\
 \
     /**\
-     * reordered opaque 64bit (generally a integer or double preccission float \
+     * reordered opaque 64bit (generally an integer or a double precision float\
      * PTS but can be anything). \
      * The user sets AVCodecContext.reordered_opaque to represent the input at\
-     * that time ,\
-     * the decoder reorderes values as needed and sets AVFrame.reordered_opaque\
+     * that time,\
+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque\
      * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque \
      * - encoding: unused\
      * - decoding: Read by user.\
(Continue reading)

Permalink | Reply | 0 comments |
headers
jbr | 1 Jan 2011 19:49
Picon

r26184 - trunk/cmdutils.c

Author: jbr
Date: Sat Jan  1 19:49:18 2011
New Revision: 26184

Log:
Update current year to 2011. Happy New Year!

Modified:
   trunk/cmdutils.c

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	Sat Jan  1 12:47:51 2011	(r26183)
+++ trunk/cmdutils.c	Sat Jan  1 19:49:18 2011	(r26184)
 <at>  <at>  -55,7 +55,7  <at>  <at>  AVCodecContext *avcodec_opts[AVMEDIA_TYP
 AVFormatContext *avformat_opts;
 struct SwsContext *sws_opts;

-const int this_year = 2010;
+const int this_year = 2011;

 void init_opts(void)
 {
Permalink | Reply | 0 comments |
headers
reimar | 1 Jan 2011 20:45
Picon

r26185 - trunk/libavcodec/amrwbdec.c

Author: reimar
Date: Sat Jan  1 20:45:08 2011
New Revision: 26185

Log:
Use AVSampleFormat instead of the deprecated SampleFormat.

Modified:
   trunk/libavcodec/amrwbdec.c

Modified: trunk/libavcodec/amrwbdec.c
==============================================================================
--- trunk/libavcodec/amrwbdec.c	Sat Jan  1 19:49:18 2011	(r26184)
+++ trunk/libavcodec/amrwbdec.c	Sat Jan  1 20:45:08 2011	(r26185)
 <at>  <at>  -1233,5 +1233,5  <at>  <at>  AVCodec amrwb_decoder = {
     .init           = amrwb_decode_init,
     .decode         = amrwb_decode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),
-    .sample_fmts    = (enum SampleFormat[]){SAMPLE_FMT_FLT,SAMPLE_FMT_NONE},
+    .sample_fmts    = (enum AVSampleFormat[]){SAMPLE_FMT_FLT,SAMPLE_FMT_NONE},
 };
Permalink | Reply | 0 comments |
headers
daniel | 1 Jan 2011 21:08
Picon

r26186 - trunk/libavutil/log.c

Author: daniel
Date: Sat Jan  1 21:08:15 2011
New Revision: 26186

Log:
Recognize FFMPEG_FORCE_NOCOLOR environment variable on Win32

Fixes issue 2461

Modified:
   trunk/libavutil/log.c

Modified: trunk/libavutil/log.c
==============================================================================
--- trunk/libavutil/log.c	Sat Jan  1 20:45:08 2011	(r26185)
+++ trunk/libavutil/log.c	Sat Jan  1 21:08:15 2011	(r26186)
 <at>  <at>  -55,7 +55,7  <at>  <at>  static void colored_fputs(int level, con
 #if defined(_WIN32) && !defined(__MINGW32CE__)
         CONSOLE_SCREEN_BUFFER_INFO con_info;
         con = GetStdHandle(STD_ERROR_HANDLE);
-        use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR");
+        use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR");
         if (use_color) {
             GetConsoleScreenBufferInfo(con, &con_info);
             attr_orig  = con_info.wAttributes;
Permalink | Reply | 0 comments |
headers
mstorsjo | 1 Jan 2011 23:27
Picon

r26187 - in trunk/libavformat: rtpdec.c rtpdec.h rtsp.c rtspdec.c

Author: mstorsjo
Date: Sat Jan  1 23:27:16 2011
New Revision: 26187

Log:
rtpdec: Emit timestamps for packets before the first RTCP packet, too

Emitted timestamps in each stream start from 0, for the first received
RTP packet. Once an RTCP packet is received, that one is used for
sync, emitting timestamps that fit seamlessly into the earlier ones.

Modified:
   trunk/libavformat/rtpdec.c
   trunk/libavformat/rtpdec.h
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtspdec.c

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Sat Jan  1 21:08:15 2011	(r26186)
+++ trunk/libavformat/rtpdec.c	Sat Jan  1 23:27:16 2011	(r26187)
 <at>  <at>  -123,9 +123,13  <at>  <at>  static int rtcp_parse_packet(RTPDemuxCon
             payload_len = (AV_RB16(buf + 2) + 1) * 4;

             s->last_rtcp_ntp_time = AV_RB64(buf + 8);
-            if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE)
-                s->first_rtcp_ntp_time = s->last_rtcp_ntp_time;
             s->last_rtcp_timestamp = AV_RB32(buf + 16);
+            if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) {
+                s->first_rtcp_ntp_time = s->last_rtcp_ntp_time;
(Continue reading)

Permalink | Reply | 0 comments |
headers
cehoyos | 2 Jan 2011 06:01
Picon

r26188 - trunk/libavformat/yuv4mpeg.c

Author: cehoyos
Date: Sun Jan  2 06:01:46 2011
New Revision: 26188

Log:
Fix a floating point exception for invalid framerate, fixes issue 2470.

Patch by Daniel Kang, daniel.d.kang at gmail

Modified:
   trunk/libavformat/yuv4mpeg.c

Modified: trunk/libavformat/yuv4mpeg.c
==============================================================================
--- trunk/libavformat/yuv4mpeg.c	Sat Jan  1 23:27:16 2011	(r26187)
+++ trunk/libavformat/yuv4mpeg.c	Sun Jan  2 06:01:46 2011	(r26188)
 <at>  <at>  -316,7 +316,7  <at>  <at>  static int yuv4_read_header(AVFormatCont
             pix_fmt = alt_pix_fmt;
     }

-    if (raten == 0 && rated == 0) {
+    if (raten <= 0 || rated <= 0) {
         // Frame rate unknown
         raten = 25;
         rated = 1;
Permalink | Reply | 0 comments |
headers
mstorsjo | 2 Jan 2011 11:06
Picon

r26189 - in trunk/libavformat: rtsp.c rtsp.h rtspdec.c rtspenc.c

Author: mstorsjo
Date: Sun Jan  2 11:06:21 2011
New Revision: 26189

Log:
rtsp: Add a method parameter to ff_rtsp_read_reply

Modified:
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtsp.h
   trunk/libavformat/rtspdec.c
   trunk/libavformat/rtspenc.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sun Jan  2 06:01:46 2011	(r26188)
+++ trunk/libavformat/rtsp.c	Sun Jan  2 11:06:21 2011	(r26189)
 <at>  <at>  -758,7 +758,7  <at>  <at>  void ff_rtsp_skip_packet(AVFormatContext

 int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
                        unsigned char **content_ptr,
-                       int return_on_interleaved_data)
+                       int return_on_interleaved_data, const char *method)
 {
     RTSPState *rt = s->priv_data;
     char buf[4096], buf1[1024], *q;
 <at>  <at>  -936,7 +936,7  <at>  <at>  retry:
                                                    send_content_length)))
         return ret;
(Continue reading)

Permalink | Reply | 0 comments |
headers
mstorsjo | 2 Jan 2011 11:07
Picon

r26190 - in trunk/libavformat: rtsp.c rtsp.h

Author: mstorsjo
Date: Sun Jan  2 11:07:56 2011
New Revision: 26190

Log:
rtsp: Pass RTSPState to ff_rtsp_parse_line, instead of HTTPAuthState

This allows ff_rtsp_parse_line to do more changes directly in RTSPState
when parsing the reply, instead of having to store large amounts of
temporary data in RTSPMessageHeader.

Modified:
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtsp.h

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sun Jan  2 11:06:21 2011	(r26189)
+++ trunk/libavformat/rtsp.c	Sun Jan  2 11:07:56 2011	(r26190)
 <at>  <at>  -685,7 +685,7  <at>  <at>  static void rtsp_parse_transport(RTSPMes
 }

 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
-                        HTTPAuthState *auth_state)
+                        RTSPState *rt)
 {
     const char *p;

 <at>  <at>  -718,12 +718,12  <at>  <at>  void ff_rtsp_parse_line(RTSPMessageHeade
     } else if (av_stristart(p, "Location:", &p)) {
(Continue reading)

Permalink | Reply | 0 comments |

Gmane