[FFmpeg-devel] [FFmpeg-cvslog] Merge commit '5f102a9559099429826e84758b8b5182244c52db'

[wm4]

On Wed, 5 Apr 2017 10:54:38 +0200
Michael Niedermayer <michael at niedermayer.cc> wrote:

> On Wed, Apr 05, 2017 at 12:31:24AM -0300, James Almer wrote:
> > On 4/4/2017 11:12 PM, Michael Niedermayer wrote:  
> > > On Tue, Apr 04, 2017 at 11:44:21AM +0200, Clément Bœsch wrote:  
> > >> ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Tue Apr  4 11:44:45 2017 +0200| [4ea942f2ceaafbfed43933895bd0e8aad043ca44] | committer: Clément Bœsch
> > >>
> > >> Merge commit '5f102a9559099429826e84758b8b5182244c52db'
> > >>
> > >> * commit '5f102a9559099429826e84758b8b5182244c52db':
> > >>   examples/encode_video: switch to the new encoding API
> > >>
> > >> Merged-by: Clément Bœsch <cboesch at gopro.com>
> > >>  
> > >>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ea942f2ceaafbfed43933895bd0e8aad043ca44  
> > >> ---
> > >>
> > >>  doc/examples/encode_video.c | 59 ++++++++++++++++++++++++---------------------
> > >>  1 file changed, 31 insertions(+), 28 deletions(-)  
> > > 
> > > This changes the output for encode_video
> > > 
> > > Is this intended?
> > > 
> > > ./doc/examples/encode_video ev.avi mpeg4
> > > Write frame   0 (size= 6467)
> > > Write frame   2 (size= 3281)
> > > Write frame   1 (size= 1874)
> > > Write frame   4 (size= 3579)
> > > Write frame   3 (size= 2069)
> > > Write frame   6 (size= 4389)
> > > Write frame   5 (size= 2204)
> > > Write frame   8 (size= 3538)
> > > Write frame   7 (size= 2348)
> > > Write frame  10 (size=13024)
> > > Write frame   9 (size= 2303)
> > > Write frame  12 (size= 4718)
> > > Write frame  11 (size= 2504)
> > > Write frame  14 (size= 5082)
> > > Write frame  13 (size= 1898)
> > > Write frame  16 (size= 4186)
> > > Write frame  15 (size= 1842)
> > > Write frame  18 (size= 4676)
> > > Write frame  17 (size= 1782)
> > > Write frame  20 (size=12942)
> > > Write frame  19 (size= 2237)
> > > Write frame  22 (size= 5180)
> > > Write frame  21 (size= 2312)
> > > Write frame  24 (size= 4520)
> > > Write frame  23 (size= 2523)
> > > 
> > > Before:
> > > ./doc/examples/encode_video ev.avi mpeg4
> > > Write frame   1 (size= 6467)
> > > Write frame   2 (size= 3281)
> > > Write frame   3 (size= 1874)
> > > Write frame   4 (size= 3579)
> > > Write frame   5 (size= 2069)
> > > Write frame   6 (size= 4389)
> > > Write frame   7 (size= 2204)
> > > Write frame   8 (size= 3538)
> > > Write frame   9 (size= 2348)
> > > Write frame  10 (size=13024)
> > > Write frame  11 (size= 2303)
> > > Write frame  12 (size= 4718)
> > > Write frame  13 (size= 2504)
> > > Write frame  14 (size= 5082)
> > > Write frame  15 (size= 1898)
> > > Write frame  16 (size= 4186)
> > > Write frame  17 (size= 1842)
> > > Write frame  18 (size= 4676)
> > > Write frame  19 (size= 1782)
> > > Write frame  20 (size=12942)
> > > Write frame  21 (size= 2237)
> > > Write frame  22 (size= 5180)
> > > Write frame  23 (size= 2312)
> > > Write frame  24 (size= 4520)
> > > Write frame  25 (size= 2523)
> > > 
> > > The written files seem to match  
> > 
> > Before this change, the printed "frame number" was a loop counter, and after
> > this changes it's the packet's pts.
> > If i make the old version also print the packet's pts i get the exact same
> > output as the new version, so i guess you could say it's "intended".  
> 
> ok then though changing the output should have been in a seperate
> commit. "switch to the new encoding API" is not really the right place
> 
> Changes which inherently dont change the output like changing API
> shouldnt artifically change it to keep them easily testable
> 
> [...]

Yeah, it's totally like you didn't do major changes in merge commits
back when you merged. (And that affected central code, not just
unimportant stuff like examples.)